Merge remote-tracking branch 'tmk/master' into cub_layout

[tmk_firmware.git] / converter / usb_usb / Makefile

diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile
index 13f77ca9b7db668c9068ba598f2503ecb581f4d0..d6867bb002644348a74188eb82d86be225cd1e77 100644 (file)
--- a/converter/usb_usb/Makefile
+++ b/converter/usb_usb/Makefile
@@ -99,16 +99,22 @@ CONSOLE_ENABLE = yes        # Console for debug
 #   Teensy halfKay   512
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
-#OPT_DEFS += -DBOOTLOADER_SIZE=4096
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 
 
 SRC =  \
-       keymap.c \
+       keymap_common.c \
        matrix.c \
        led.c \
        main.cpp
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap.c $(SRC)
+endif
+
 CONFIG_H = config.h
 
 
@@ -120,7 +126,7 @@ VPATH += $(TOP_DIR)
 
 
 # program Leonardo
-PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -P$(DEV) -b57600 -Uflash:w:$(TARGET).hex
+PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -b57600 -Uflash:w:$(TARGET).hex -P$(DEV)