diff options
author | Joel Challis <git@zvecr.com> | 2021-07-28 12:01:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 12:01:49 +0100 |
commit | 4ef8ff458d7dcf49a288bb484323ab2098a21ef9 (patch) | |
tree | e0b8e423300a2375ce0f66f301c57d25e01e6c02 /common_features.mk | |
parent | 50964ae82160921f2c442e18c1ffc15316c29815 (diff) | |
download | qmk_firmware-4ef8ff458d7dcf49a288bb484323ab2098a21ef9.tar.gz qmk_firmware-4ef8ff458d7dcf49a288bb484323ab2098a21ef9.zip |
Minor tidy up of key overrides (#13747)
* Minor tidy up of key overrides
* Update quantum/quantum.c
* Update quantum/quantum.c
Diffstat (limited to 'common_features.mk')
-rw-r--r-- | common_features.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common_features.mk b/common_features.mk index 91e9154f4..d8dce8a63 100644 --- a/common_features.mk +++ b/common_features.mk | |||
@@ -334,11 +334,6 @@ ifeq ($(strip $(PRINTING_ENABLE)), yes) | |||
334 | SRC += $(TMK_DIR)/protocol/serial_uart.c | 334 | SRC += $(TMK_DIR)/protocol/serial_uart.c |
335 | endif | 335 | endif |
336 | 336 | ||
337 | ifeq ($(strip $(KEY_OVERRIDE_ENABLE)), yes) | ||
338 | OPT_DEFS += -DKEY_OVERRIDE_ENABLE | ||
339 | SRC += $(QUANTUM_DIR)/process_keycode/process_key_override.c | ||
340 | endif | ||
341 | |||
342 | ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) | 337 | ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) |
343 | SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c) | 338 | SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c) |
344 | SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) | 339 | SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) |
@@ -663,6 +658,11 @@ ifeq ($(strip $(COMBO_ENABLE)), yes) | |||
663 | OPT_DEFS += -DCOMBO_ENABLE | 658 | OPT_DEFS += -DCOMBO_ENABLE |
664 | endif | 659 | endif |
665 | 660 | ||
661 | ifeq ($(strip $(KEY_OVERRIDE_ENABLE)), yes) | ||
662 | SRC += $(QUANTUM_DIR)/process_keycode/process_key_override.c | ||
663 | OPT_DEFS += -DKEY_OVERRIDE_ENABLE | ||
664 | endif | ||
665 | |||
666 | ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) | 666 | ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) |
667 | SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c | 667 | SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c |
668 | OPT_DEFS += -DTAP_DANCE_ENABLE | 668 | OPT_DEFS += -DTAP_DANCE_ENABLE |