From: Oleg Kostyuk Date: Sat, 3 Jan 2015 11:55:49 +0000 (+0200) Subject: Include $(TOP_DIR)/protocol.mk X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=de5fe8238685a416b49a402dbee4a781d734020f;hp=eeb6463091847159308da72a64cfd8dd0271941b;p=max%2Ftmk_keyboard.git Include $(TOP_DIR)/protocol.mk --- diff --git a/keyboard/ergodox/Makefile.lufa b/keyboard/ergodox/Makefile.lufa index 07241b03..6edba8c0 100644 --- a/keyboard/ergodox/Makefile.lufa +++ b/keyboard/ergodox/Makefile.lufa @@ -99,7 +99,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # LUFA bootloader 4096 OPT_DEFS += -DBOOTLOADER_SIZE=512 - # Build Options # comment out to disable the options. # @@ -109,7 +108,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+600) CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +NKRO_ENABLE = yes # USB Nkey Rollover (+500) #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support INVERT_NUMLOCK = yes # invert state of NumLock led @@ -118,6 +117,7 @@ INVERT_NUMLOCK = yes # invert state of NumLock led VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) +include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol/lufa.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk diff --git a/keyboard/ergodox/Makefile.pjrc b/keyboard/ergodox/Makefile.pjrc index e36cbc6b..9a6da577 100644 --- a/keyboard/ergodox/Makefile.pjrc +++ b/keyboard/ergodox/Makefile.pjrc @@ -87,7 +87,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+600) CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover(+500) +NKRO_ENABLE = yes # USB Nkey Rollover (+500) #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support INVERT_NUMLOCK = yes # invert state of NumLock led @@ -96,6 +96,7 @@ INVERT_NUMLOCK = yes # invert state of NumLock led VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) +include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol/pjrc.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk