Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / keyboard / hhkb / Makefile.pjrc

diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc
index f6d133eae4c5402ee67137ce1f9537ab89c1b67a..b6ce9c7504e9ae632e9d6d5733b0acf9e41c3ef1 100644 (file)
--- a/keyboard/hhkb/Makefile.pjrc
+++ b/keyboard/hhkb/Makefile.pjrc
@@ -13,20 +13,25 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =   keymap_common.c \
        matrix.c \
        led.c
 
-CONFIG_H = config_pjrc.h
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_hasu.c $(SRC)
+endif
+
+CONFIG_H = config.h
 
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
 #MCU = at90usb162       # Teensy 1.0
-#MCU = atmega32u4       # Teensy 2.0
+MCU = atmega32u4       # Teensy 2.0
 #MCU = at90usb646       # Teensy++ 1.0
-MCU = at90usb1286      # Teensy++ 2.0
+#MCU = at90usb1286      # Teensy++ 2.0
 
 
 # Processor frequency.
@@ -39,9 +44,12 @@ F_CPU = 16000000
 
 # Build Options
 #   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
-#PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
 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
 
 
@@ -52,9 +60,9 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
 # Search Path
-VPATH = $(TARGET_DIR)
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
 
 include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk