Change handling of CUSTOM_MATRIX in common_features.mk slightly.

[qmk_firmware.git] / common_features.mk

diff --git a/common_features.mk b/common_features.mk
index 883681324b042abb64239a3332231b4b86b07e47..572a6db548bafdb39bbbd0d8559485ea09eec144 100644 (file)
--- a/common_features.mk
+++ b/common_features.mk
@@ -254,18 +254,20 @@ 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
     QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/i2c.c
     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