adb_usb: Fix mouse_init

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

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 69be0e13e391906b45bbd446118cc1694ca004c2..a38ff081ddd6937a3b94a7f27a5d16d0d0c4164e 100644 (file)
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -21,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
@@ -49,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)))
@@ -94,8 +99,8 @@ ifeq (yes,$(strip $(KEYMAP_SECTION_ENABLE)))
 endif
 
 # Version string
-VERSION := $(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
-OPT_DEFS += -DVERSION=$(VERSION)
+TMK_VERSION := $(shell (git describe --always --dirty=+ || echo 'unknown') 2> /dev/null)
+OPT_DEFS += -DTMK_VERSION=$(TMK_VERSION)
 
 
 # Search Path