improve layer switching

[qmk_firmware.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index df367128b8b184ef6e11a06c97e85386da28ef80..bec799c089ab614cf4a62807ba76cc874898f5fd 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -50,13 +50,16 @@
 
 # List C source files here. (C dependencies are automatically generated.)
 SRC =  tmk.c \
+       layer.c \
        key_process.c \
        usb_keyboard.c \
        usb_mouse.c \
        usb_debug.c \
        usb.c \
        jump_bootloader.c \
-       print.c
+       print.c \
+       timer.c \
+       util.c
 SRC += $(TARGET_SRC)
 
 # C source file search path
@@ -116,17 +119,41 @@ CSTANDARD = -std=gnu99
 
 
 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DDESCRIPTION=$(DESCRIPTION)
+CDEFS = -DF_CPU=$(F_CPU)UL
+CDEFS += -DDESCRIPTION=$(DESCRIPTION)
+CDEFS += -DVENDOR_ID=$(VENDOR_ID)
+CDEFS += -DPRODUCT_ID=$(PRODUCT_ID)
+CDEFS += -DMANUFACTURER=$(MANUFACTURER)
+CDEFS += -DPRODUCT=$(PRODUCT)
+ifdef MOUSE_DELAY_TIME
+CDEFS += -DMOUSE_DELAY_TIME=$(MOUSE_DELAY_TIME)
+endif
 
 
 # Place -D or -U options here for ASM sources
-ADEFS = -DF_CPU=$(F_CPU) -DDESCRIPTION=$(DESCRIPTION)
+ADEFS = -DF_CPU=$(F_CPU)
+ADEFS += -DDESCRIPTION=$(DESCRIPTION)
+ADEFS += -DVENDOR_ID=$(VENDOR_ID)
+ADEFS += -DPRODUCT_ID=$(PRODUCT_ID)
+ADEFS += -DMANUFACTURER=$(MANUFACTURER)
+ADEFS += -DPRODUCT=$(PRODUCT)
+ifdef MOUSE_DELAY_TIME
+ADEFS += -DMOUSE_DELAY_TIME=$(MOUSE_DELAY_TIME)
+endif
 
 
 # Place -D or -U options here for C++ sources
-CPPDEFS = -DF_CPU=$(F_CPU)UL -DDESCRIPTION=$(DESCRIPTION)
+CPPDEFS = -DF_CPU=$(F_CPU)UL -DDESCRIPTION=$(DESCRIPTION) -DVENDOR_ID=$(VENDOR_ID) -DPRODUCT_ID=$(PRODUCT_ID)
 #CPPDEFS += -D__STDC_LIMIT_MACROS
 #CPPDEFS += -D__STDC_CONSTANT_MACROS
+CPPDEFS += -DDESCRIPTION=$(DESCRIPTION)
+CPPDEFS += -DVENDOR_ID=$(VENDOR_ID)
+CPPDEFS += -DPRODUCT_ID=$(PRODUCT_ID)
+CPPDEFS += -DMANUFACTURER=$(MANUFACTURER)
+CPPDEFS += -DPRODUCT=$(PRODUCT)
+ifdef MOUSE_DELAY_TIME
+CPPDEFS += -DMOUSE_DELAY_TIME=$(MOUSE_DELAY_TIME)
+endif