Move Split Common VPATH addition (#4716) 0.6.220
authorDrashna Jaelre <drashna@live.com>
Mon, 31 Dec 2018 16:45:44 +0000 (08:45 -0800)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Mon, 31 Dec 2018 16:45:44 +0000 (08:45 -0800)
Specifically, only add the split_common folder to COMMON_VPATH if the feature is eanbled, to prevent issues with compilation

common.mk
common_features.mk

index 272d170..aea29a7 100644 (file)
--- 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)
index 8836813..c86e8bb 100644 (file)
@@ -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