summaryrefslogtreecommitdiffstats
path: root/common_features.mk
diff options
context:
space:
mode:
authormtei <2170248+mtei@users.noreply.github.com>2019-01-13 18:56:46 +0100
committerDrashna Jaelre <drashna@live.com>2019-01-13 20:04:40 +0100
commit929065b1a97eb15a54a65c866d19d45998f775c6 (patch)
tree8ace532b66d9d18012945f26dbb397f4df133546 /common_features.mk
parentc8cbee5d718244dd06fda66a0edf5d4cb73b2434 (diff)
downloadqmk_firmware-929065b1a97eb15a54a65c866d19d45998f775c6.tar.gz
qmk_firmware-929065b1a97eb15a54a65c866d19d45998f775c6.tar.xz
Change handling of CUSTOM_MATRIX in common_features.mk slightly.
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk17
1 files changed, 9 insertions, 8 deletions
diff --git a/common_features.mk b/common_features.mk
index c86e8bbfe..572a6db54 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -254,15 +254,12 @@ QUANTUM_SRC:= \
$(QUANTUM_DIR)/keymap_common.c \
$(QUANTUM_DIR)/keycode_config.c
-ifneq ($(strip $(CUSTOM_MATRIX)), yes)
- ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
- QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
- else
- QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
- endif
-endif
-
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+ ifneq ($(strip $(CUSTOM_MATRIX)), yes)
+ QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
+ # Do not use $(QUANTUM_DIR)/matrix.c.
+ CUSTOM_MATRIX=yes
+ endif
OPT_DEFS += -DSPLIT_KEYBOARD
QUANTUM_SRC += $(QUANTUM_DIR)/split_common/split_flags.c \
$(QUANTUM_DIR)/split_common/split_util.c
@@ -270,3 +267,7 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/serial.c
COMMON_VPATH += $(QUANTUM_PATH)/split_common
endif
+
+ifneq ($(strip $(CUSTOM_MATRIX)), yes)
+ QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
+endif