Merge branch 'unimap'

[max/tmk_keyboard.git] / keyboard / gh60 / Makefile.pjrc

diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index 2538c0c6bbbcdf7ec320832a569c1d9420e99ace..11bd3b7840eae36da14795e748a0d0818649bf0b 100644 (file)
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -42,25 +42,29 @@
 TARGET = gh60_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
-# keyboard dependent files
-SRC =  keymap.c \
+# project specific files
+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
 
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
-#MCU = at90usb162       # Teensy 1.0
-MCU = atmega32u4       # Teensy 2.0
-#MCU = at90usb646       # Teensy++ 1.0
-#MCU = at90usb1286      # Teensy++ 2.0
+MCU = atmega32u4
+#MCU = at90usb1286
 
 
 # Processor frequency.
@@ -70,29 +74,34 @@ MCU = atmega32u4       # Teensy 2.0
 #   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.
 #
+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
 
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 plain: OPT_DEFS += -DKEYMAP_PLAIN
 plain: all