diff options
author | dbroqua <dbroqua@mousur.org> | 2017-04-02 23:27:57 +0200 |
---|---|---|
committer | dbroqua <dbroqua@mousur.org> | 2017-04-02 23:27:57 +0200 |
commit | e7347ff0de93ff823462b3ff2b4136b44dc576c0 (patch) | |
tree | 286e2a78fee74eb370641a981d2c81c8e02942b4 /build_keyboard.mk | |
parent | 9e72b7e7e97f9ae92c7eb1de66aa03cad047baf6 (diff) | |
parent | 24ec8f509703cbaf9de7b41d251dbb7fcd339559 (diff) | |
download | qmk_firmware-e7347ff0de93ff823462b3ff2b4136b44dc576c0.tar.gz qmk_firmware-e7347ff0de93ff823462b3ff2b4136b44dc576c0.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index b85557d4a9..4a6fc0980f 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 @@ -156,18 +161,26 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes) SRC += $(QUANTUM_DIR)/audio/luts.c endif +ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes) + OPT_DEFS += -DFAUXCLICKY_ENABLE + SRC += $(QUANTUM_DIR)/fauxclicky.c +endif + ifeq ($(strip $(UCIS_ENABLE)), yes) OPT_DEFS += -DUCIS_ENABLE - UNICODE_ENABLE = yes + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c + SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c endif ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) OPT_DEFS += -DUNICODEMAP_ENABLE - UNICODE_ENABLE = yes + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c + SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c endif ifeq ($(strip $(UNICODE_ENABLE)), yes) OPT_DEFS += -DUNICODE_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c endif |