summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-12-31 08:45:44 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-12-31 08:45:44 -0800
commit7f0def77a201bd419517332581dbc2cc3b0bd7eb (patch)
tree251621ffda88432d263d591fab49e05d9d19fe2c
parentb7688590b8a252f7497e3f78d569b98ae62ab177 (diff)
Move Split Common VPATH addition (#4716)0.6.220
Specifically, only add the split_common folder to COMMON_VPATH if the feature is eanbled, to prevent issues with compilation
-rw-r--r--common.mk1
-rw-r--r--common_features.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 272d170e68..aea29a7a20 100644
--- a/common.mk
+++ b/common.mk
@@ -21,5 +21,4 @@ COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
COMMON_VPATH += $(QUANTUM_PATH)/audio
COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
COMMON_VPATH += $(QUANTUM_PATH)/api
-COMMON_VPATH += $(QUANTUM_PATH)/split_common
COMMON_VPATH += $(DRIVER_PATH)
diff --git a/common_features.mk b/common_features.mk
index 883681324b..c86e8bbfe3 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -268,4 +268,5 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
$(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