summaryrefslogtreecommitdiff
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorDavid Olsson2017-02-11 10:50:37 +0100
committerDavid Olsson2017-02-11 10:50:37 +0100
commit052f81aacaa3b5afa93f9db3667f31f9365348ce (patch)
treedcfde5c6fed00e248535ac4d975831f33316cc8a /build_keyboard.mk
parentaa69337cf563d7b37722aabfcd1c5bae6c185208 (diff)
parent835556da9111d91b71c545d6a273e843f07631ae (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r--build_keyboard.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index ce505de12..2c64e93a2 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -144,6 +144,11 @@ ifeq ($(strip $(MIDI_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
endif
+ifeq ($(strip $(COMBO_ENABLE)), yes)
+ OPT_DEFS += -DCOMBO_ENABLE
+ SRC += $(QUANTUM_DIR)/process_keycode/process_combo.c
+endif
+
ifeq ($(strip $(VIRTSER_ENABLE)), yes)
OPT_DEFS += -DVIRTSER_ENABLE
endif
@@ -221,7 +226,11 @@ OPT_DEFS += $(TMK_COMMON_DEFS)
EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
ifeq ($(PLATFORM),AVR)
+ifeq ($(strip $(PROTOCOL)), VUSB)
+ include $(TMK_PATH)/protocol/vusb.mk
+else
include $(TMK_PATH)/protocol/lufa.mk
+endif
include $(TMK_PATH)/avr.mk
endif