diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-12-31 08:45:44 -0800 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-12-31 08:45:44 -0800 |
| commit | 7f0def77a201bd419517332581dbc2cc3b0bd7eb (patch) | |
| tree | 251621ffda88432d263d591fab49e05d9d19fe2c | |
| parent | b7688590b8a252f7497e3f78d569b98ae62ab177 (diff) | |
| download | qmk_firmware-7f0def77a201bd419517332581dbc2cc3b0bd7eb.tar.gz qmk_firmware-7f0def77a201bd419517332581dbc2cc3b0bd7eb.zip | |
Move Split Common VPATH addition (#4716)
Specifically, only add the split_common folder to COMMON_VPATH if the feature is eanbled, to prevent issues with compilation
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | common_features.mk | 1 |
2 files changed, 1 insertions, 1 deletions
| @@ -21,5 +21,4 @@ COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras | |||
| 21 | COMMON_VPATH += $(QUANTUM_PATH)/audio | 21 | COMMON_VPATH += $(QUANTUM_PATH)/audio |
| 22 | COMMON_VPATH += $(QUANTUM_PATH)/process_keycode | 22 | COMMON_VPATH += $(QUANTUM_PATH)/process_keycode |
| 23 | COMMON_VPATH += $(QUANTUM_PATH)/api | 23 | COMMON_VPATH += $(QUANTUM_PATH)/api |
| 24 | COMMON_VPATH += $(QUANTUM_PATH)/split_common | ||
| 25 | COMMON_VPATH += $(DRIVER_PATH) | 24 | COMMON_VPATH += $(DRIVER_PATH) |
diff --git a/common_features.mk b/common_features.mk index 883681324..c86e8bbfe 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -268,4 +268,5 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes) | |||
| 268 | $(QUANTUM_DIR)/split_common/split_util.c | 268 | $(QUANTUM_DIR)/split_common/split_util.c |
| 269 | QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/i2c.c | 269 | QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/i2c.c |
| 270 | QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/serial.c | 270 | QUANTUM_LIB_SRC += $(QUANTUM_DIR)/split_common/serial.c |
| 271 | COMMON_VPATH += $(QUANTUM_PATH)/split_common | ||
| 271 | endif | 272 | endif |
