Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

[qmk_firmware.git] / build_keyboard.mk

diff --git a/build_keyboard.mk b/build_keyboard.mk
index c1e55400390b14b3e1c400bc1038c908c639190a..2c64e93a28203660d7dd847c7c3823f0bf3874fd 100644 (file)
--- 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
@@ -213,6 +218,7 @@ endif
 VPATH += $(KEYBOARD_PATH)
 VPATH += $(COMMON_VPATH)
 
+include $(TMK_PATH)/protocol.mk
 
 include $(TMK_PATH)/common.mk
 SRC += $(TMK_COMMON_SRC)
@@ -220,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