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

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

diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index f03ca9416d28bc4bcb772676c533ebcd0c90b51f..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
 
 
@@ -68,11 +74,13 @@ MCU = atmega32u4
 #   examples use this variable to calculate timings.  Do not add a "UL" here.
 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
 #   comment out to disable the options.
@@ -80,8 +88,10 @@ OPT_DEFS += -DBOOT_SIZE=4096
 BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys(+5000)
 EXTRAKEY_ENABLE = yes  # Audio control and System control(+600)
-NKRO_ENABLE = yes      # USB Nkey Rollover(+500)
 CONSOLE_ENABLE = yes    # Console for debug
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes      # USB Nkey Rollover(+500)
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support