resolves conflicts in rgblight.c

[qmk_firmware.git] / keyboard / hhkb / Makefile

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 34221937218688fce9d1a0935bf60a04c0d088de..d434246cef3d22618d996aeaea550b4ed02c8023 100644 (file)
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -42,14 +42,14 @@
 TARGET = hhkb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC += keymap.c \
+SRC += keymap_common.c \
        matrix.c \
        led.c
 
@@ -96,7 +96,7 @@ ARCH = AVR8
 F_USB = $(F_CPU)
 
 # Interrupt driven control endpoint task
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
 # Boot Section Size in *bytes*
@@ -111,26 +111,50 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes      # USB Nkey Rollover
+BOOTMAGIC_ENABLE = yes         # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = yes           # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # USB Nkey Rollover
+#KEYMAP_SECTION_ENABLE = yes   # fixed address keymap for keymap editor
+#HHKB_JP = yes                 # HHKB JP support
 
+#OPT_DEFS += -DNO_ACTION_TAPPING
+#OPT_DEFS += -DNO_ACTION_LAYER
+#OPT_DEFS += -DNO_ACTION_MACRO
+
+
+#
+# Keymap file
+#
+ifdef KEYMAP
+    SRC := keymaps/$(KEYMAP).c $(SRC)
+else
+    ifdef HHKB_JP
+       SRC := keymaps/jp.c $(SRC)
+    else 
+       SRC := keymaps/hhkb.c $(SRC)
+    endif
+endif
+
+
+ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+    OPT_DEFS += -DHHKB_JP
+endif
 
-# keymap section
-EXTRALDFLAGS = -Wl,-Tld_keymap_avr5.x
-OPT_DEFS += -DKEYMAP_SECTION
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
-debug-on: EXTRAFLAGS += -DDEBUG
-#debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
+debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
 debug-on: all
+
+debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
+debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
+debug-off: all