diff options
author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
---|---|---|
committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
commit | 430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch) | |
tree | f3d13283dd812277bc30d75dff32ea16508b58c8 /common_features.mk | |
parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'common_features.mk')
-rw-r--r-- | common_features.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common_features.mk b/common_features.mk index 0adf81afac..f405d5c07b 100644 --- a/common_features.mk +++ b/common_features.mk @@ -104,6 +104,11 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c endif +ifeq ($(strip $(KEY_LOCK_ENABLE)), yes) + OPT_DEFS += -DKEY_LOCK_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_key_lock.c +endif + ifeq ($(strip $(PRINTING_ENABLE)), yes) OPT_DEFS += -DPRINTING_ENABLE SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c @@ -156,4 +161,4 @@ QUANTUM_SRC:= \ ifndef CUSTOM_MATRIX QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c -endif
\ No newline at end of file +endif |