diff options
author | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
---|---|---|
committer | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
commit | 25a7c941746d077d246468bec6bebdb01e478090 (patch) | |
tree | 906b491bb1465be287ec4dc02e9857437f7582a6 /build_keyboard.mk | |
parent | d1fb51976aeef8eeea5975c5bf75b6b1aa649826 (diff) | |
parent | f5c8c5d4c854c5ae4dc586066c9b03557786c4c2 (diff) | |
download | firmware-25a7c941746d077d246468bec6bebdb01e478090.tar.gz firmware-25a7c941746d077d246468bec6bebdb01e478090.tar.bz2 firmware-25a7c941746d077d246468bec6bebdb01e478090.zip |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index b85557d4a..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 |