X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fhhkb%2FMakefile;h=5cf02d194ec05c9a87d2324f3818dfce5491feef;hb=ee70fe59ee8ebc6dcbf55171b1a2dd72e1744ae6;hp=89d05ba1598eea22f0deb15eac9e17fc00a26592;hpb=6d76e600958c72491c3a9eda661d23076dde38b0;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 89d05ba1..5cf02d19 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -53,12 +53,6 @@ SRC +=	keymap_common.c \
 	matrix.c \
 	led.c
 
-ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
-else
-    SRC := keymap_hasu.c $(SRC)
-endif
-
 CONFIG_H = config.h
 
 
@@ -102,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*
@@ -123,7 +117,27 @@ 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
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
+#HHKB_JP = yes			# HHKB JP support
+
+
+ifdef HHKB_JP
+    OPT_DEFS += -DHHKB_JP
+endif
+
+
+#
+# Keymap file
+#
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    ifdef HHKB_JP
+    	SRC := keymap_jp.c $(SRC)
+    else 
+    	SRC := keymap_hhkb.c $(SRC)
+    endif
+endif
 
 
 # Search Path
@@ -138,4 +152,5 @@ 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