diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-03-05 22:58:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 22:58:13 +0100 |
| commit | 24ec8f509703cbaf9de7b41d251dbb7fcd339559 (patch) | |
| tree | 90f4f9adf406d92c6817c412256904a97c716daf /build_keyboard.mk | |
| parent | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (diff) | |
| parent | 615bfc4eca8204b73c592a076ca02aeaeceb7e1e (diff) | |
Merge pull request #18 from qmk/master
Merge from qmk
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 |