diff options
| author | Ryan <fauxpark@gmail.com> | 2021-06-23 10:53:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 10:53:00 +1000 |
| commit | 4319aca91c13d817398016164bdfb0d0720e6f4b (patch) | |
| tree | 15483e38c369137edc6a96947577e3ce9b09a03d /common_features.mk | |
| parent | 973a006c4561218eef365733558c1c31e2abdb49 (diff) | |
| download | qmk_firmware-4319aca91c13d817398016164bdfb0d0720e6f4b.tar.gz qmk_firmware-4319aca91c13d817398016164bdfb0d0720e6f4b.zip | |
Fix linker error when rgblight and RGB Matrix are both enabled (#13304)
Diffstat (limited to 'common_features.mk')
| -rw-r--r-- | common_features.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common_features.mk b/common_features.mk index 33a8da23d..a790b8432 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -233,9 +233,9 @@ endif | |||
| 233 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix | 233 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix |
| 234 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations | 234 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations |
| 235 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners | 235 | COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners |
| 236 | SRC += process_backlight.c | 236 | SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c |
| 237 | SRC += led_matrix.c | 237 | SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c |
| 238 | SRC += led_matrix_drivers.c | 238 | SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c |
| 239 | CIE1931_CURVE := yes | 239 | CIE1931_CURVE := yes |
| 240 | 240 | ||
| 241 | ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731) | 241 | ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731) |
| @@ -261,9 +261,9 @@ endif | |||
| 261 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix | 261 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix |
| 262 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations | 262 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations |
| 263 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners | 263 | COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners |
| 264 | SRC += color.c | 264 | SRC += $(QUANTUM_DIR)/color.c |
| 265 | SRC += rgb_matrix.c | 265 | SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c |
| 266 | SRC += rgb_matrix_drivers.c | 266 | SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c |
| 267 | CIE1931_CURVE := yes | 267 | CIE1931_CURVE := yes |
| 268 | RGB_KEYCODES_ENABLE := yes | 268 | RGB_KEYCODES_ENABLE := yes |
| 269 | 269 | ||