diff options
author | milestogo <milestogo@users.noreply.github.com> | 2017-02-10 08:28:39 +0100 |
---|---|---|
committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-10 08:28:39 +0100 |
commit | b0537f75df73ca5a55355c7546d45577cb2c6a38 (patch) | |
tree | 0da100dc4fcbe21629a10879b53e13d02c25c170 /build_keyboard.mk | |
parent | 5ac0e6e6aee64c9b8fade79aaf22bc839e2c6b47 (diff) | |
parent | 41c93575a838e9b201ca113165085f47198e109d (diff) | |
download | qmk_firmware-b0537f75df73ca5a55355c7546d45577cb2c6a38.tar.gz qmk_firmware-b0537f75df73ca5a55355c7546d45577cb2c6a38.tar.xz |
Merge branch 'master' into sculpt2
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 |