Merge pull request #230 from jerryen/master

[max/tmk_keyboard.git] / converter / usb_usb / Makefile

diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile
index a1ceaaa4e6e392b6c841c1def788c651e41b49a9..0f25232b2599ca93350cdae2f2cc1a02000b40c1 100644 (file)
--- a/converter/usb_usb/Makefile
+++ b/converter/usb_usb/Makefile
@@ -27,7 +27,7 @@
 # make flip-ee = Download the eeprom file to the device, using Atmel FLIP
 #                (must have Atmel FLIP installed).
 #
-# make debug = Start either simulavr or avarice as specified for debugging, 
+# make debug = Start either simulavr or avarice as specified for debugging,
 #              with avr-gdb or avr-insight as the front end for debugging.
 #
 # make filename.s = Just compile filename.c into the assembler code only.
@@ -41,7 +41,7 @@
 # Target file name (without extension).
 TARGET = usb_usb
 
-TMK_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -93,6 +93,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Media control and System control
 CONSOLE_ENABLE = yes   # Console for debug
+#COMMAND_ENABLE = yes    # Commands for debug and configuration
 #NKRO_ENABLE = yes     # USB Nkey Rollover
 
 # Boot Section Size in bytes
@@ -101,12 +102,15 @@ CONSOLE_ENABLE = yes      # Console for debug
 #   LUFA bootloader  4096
 OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
+#LDFLAGS += -Wl,--relax
 
+#OPT_DEFS += -DNO_ACTION_TAPPING
+#OPT_DEFS += -DNO_ACTION_LAYER
+#OPT_DEFS += -DNO_ACTION_MACRO
 
 SRC =  \
        keymap_common.c \
        matrix.c \
-       led.c \
        main.cpp
 
 ifdef KEYMAP