resolves conflicts in rgblight.c

[qmk_firmware.git] / keyboard / hhkb / Makefile

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 2f87d42fb7147e348c3f54016136febc49adc8ce..d434246cef3d22618d996aeaea550b4ed02c8023 100644 (file)
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -120,22 +120,26 @@ 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 := keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
     ifdef HHKB_JP
-       SRC := keymap_jp.c $(SRC)
+       SRC := keymaps/jp.c $(SRC)
     else 
-       SRC := keymap_hhkb.c $(SRC)
+       SRC := keymaps/hhkb.c $(SRC)
     endif
 endif
 
 
-ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
     OPT_DEFS += -DHHKB_JP
 endif