Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / keyboard / gh60 / Makefile.pjrc

diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index c12334fcafc06ad011e2f20088130089fdec676d..9655ff65a99ad54df7d68f4ace81769fac88c2cf 100644 (file)
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -48,10 +48,16 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap.c \
+SRC =  keymap_common.c \
        matrix.c \
        led.c
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_poker.c $(SRC)
+endif
+
 CONFIG_H = config.h
 
 
@@ -69,11 +75,11 @@ MCU = atmega32u4
 F_CPU = 16000000
 
 
-# Boot Section Size in bytes
+# Boot Section Size in *bytes*
 #   Teensy halfKay   512
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
-OPT_DEFS += -DBOOT_SIZE=4096
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 
 # Build Options