Merge branch 'debouncing_fix'

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

diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index 9adec24b13d2a98ae77f56a77544ae99bc4f0494..a5ff609a778698569e1d5d372c5302aa1f3868f9 100644 (file)
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -47,8 +47,7 @@ TOP_DIR = ../..
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
-
-# List C source files here. (C dependencies are automatically generated.)
+# project specific files
 SRC += keymap.c \
        matrix.c \
        led.c
@@ -93,23 +92,23 @@ ARCH = AVR8
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 
+# Interrupt driven control endpoint task(+60)
+#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
 
 # Build Options
 #   comment out to disable the options.
 #
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
+CONSOLE_ENABLE = yes   # Console for debug(+400)
 #NKRO_ENABLE = yes     # USB Nkey Rollover - not yet supported in LUFA
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
 
 
-# Boot Section Size in bytes
-#   Teensy halfKay   512
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-OPT_DEFS += -DBOOT_SIZE=4096
-
+# Optimize size but this may cause error "relocation truncated to fit"
+EXTRALDFLAGS = -Wl,--relax
 
 # Search Path
 VPATH += $(TARGET_DIR)
@@ -125,8 +124,8 @@ plain: all
 poker: OPT_DEFS += -DKEYMAP_POKER
 poker: all
 
-poker_bit: OPT_DEFS += -DKEYMAP_POKER_SET
-poker_bit: all
+poker_set: OPT_DEFS += -DKEYMAP_POKER_SET
+poker_set: all
 
 poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT
 poker_bit: all