~ruther/qmk_firmware

4319aca91c13d817398016164bdfb0d0720e6f4b — Ryan 4 years ago 973a006
Fix linker error when rgblight and RGB Matrix are both enabled (#13304)

1 files changed, 6 insertions(+), 6 deletions(-)

M common_features.mk
M common_features.mk => common_features.mk +6 -6
@@ 233,9 233,9 @@ endif
    COMMON_VPATH += $(QUANTUM_DIR)/led_matrix
    COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
    COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
    SRC += process_backlight.c
    SRC += led_matrix.c
    SRC += led_matrix_drivers.c
    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
    SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
    SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
    CIE1931_CURVE := yes

    ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)


@@ 261,9 261,9 @@ endif
    COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix
    COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
    COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
    SRC += color.c
    SRC += rgb_matrix.c
    SRC += rgb_matrix_drivers.c
    SRC += $(QUANTUM_DIR)/color.c
    SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
    SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
    CIE1931_CURVE := yes
    RGB_KEYCODES_ENABLE := yes