X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fhhkb%2FMakefile;h=1146d5ec86ff2e581a4ebbd3bf9ed76640ee0a96;hb=42dfaa3a39fec331a1cd51dd78dcdd4340691bd1;hp=dc5c06a948193f92afb1a04dcce9dc7ad25782c8;hpb=703ca9de213955443f8713901cc96d482633931f;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index dc5c06a9..1146d5ec 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -42,15 +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_common.c \
-	matrix.c \
+SRC +=	matrix.c \
 	led.c
 
 CONFIG_H = config.h
@@ -119,18 +118,34 @@ 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
+#UNIMAP_ENABLE = yes
+#ACTIONMAP_ENABLE = yes         # Use 16bit actionmap instead of 8bit keymap
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
+
+#OPT_DEFS += -DNO_ACTION_TAPPING
+#OPT_DEFS += -DNO_ACTION_LAYER
+#OPT_DEFS += -DNO_ACTION_MACRO
 
 
 #
 # Keymap file
 #
+ifdef UNIMAP_ENABLE
+    KEYMAP_FILE = unimap
+else
+    ifdef ACTIONMAP_ENABLE
+        KEYMAP_FILE = actionmap
+    else
+        KEYMAP_FILE = keymap
+    endif
+endif
 ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
+    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
 else
     ifdef HHKB_JP
-    	SRC := keymap_jp.c $(SRC)
+        SRC := $(KEYMAP_FILE)_jp.c $(SRC)
     else 
-    	SRC := keymap_hhkb.c $(SRC)
+        SRC := $(KEYMAP_FILE)_hhkb.c $(SRC)
     endif
 endif
 
@@ -142,11 +157,11 @@ endif
 
 # 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 -DDEBUG_ACTION
 debug-on: all