diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
| commit | a54da1b92663606f5e5c18bc1eaec30c06847da1 (patch) | |
| tree | a1b7485debf62a8c52d1db3199436cac2f3ce346 /converter/usb_usb/Makefile | |
| parent | 4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff) | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'converter/usb_usb/Makefile')
| -rw-r--r-- | converter/usb_usb/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile index 13f77ca9b7..d6867bb002 100644 --- 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) |