usb_hid: Change to USB_Host_Shield_2.0 of tmk repo

[max/tmk_keyboard.git] / tmk_core / common.mk

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index d91e6d6d969382b1933ff7a668827feda3ab4595..06507ecf2d0474cd4509eecb24fccc853f6e368a 100644 (file)
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -1,6 +1,7 @@
 COMMON_DIR = common
 SRC += $(COMMON_DIR)/host.c \
        $(COMMON_DIR)/keyboard.c \
+       $(COMMON_DIR)/matrix.c \
        $(COMMON_DIR)/action.c \
        $(COMMON_DIR)/action_tapping.c \
        $(COMMON_DIR)/action_macro.c \
@@ -20,6 +21,7 @@ SRC +=        $(COMMON_DIR)/host.c \
 ifeq (yes,$(strip $(UNIMAP_ENABLE)))
     SRC += $(COMMON_DIR)/unimap.c
     OPT_DEFS += -DUNIMAP_ENABLE
+    OPT_DEFS += -DACTIONMAP_ENABLE
 else
     ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
        SRC += $(COMMON_DIR)/actionmap.c
@@ -48,8 +50,12 @@ endif
 ifeq (yes,$(strip $(CONSOLE_ENABLE)))
     OPT_DEFS += -DCONSOLE_ENABLE
 else
-    OPT_DEFS += -DNO_PRINT
-    OPT_DEFS += -DNO_DEBUG
+    # Remove print functions when console is disabled and
+    # no other print method like UART is available
+    ifneq (yes, $(strip $(DEBUG_PRINT_AVAILABLE)))
+       OPT_DEFS += -DNO_PRINT
+       OPT_DEFS += -DNO_DEBUG
+    endif
 endif
 
 ifeq (yes,$(strip $(COMMAND_ENABLE)))