diff options
| -rw-r--r-- | keyboards/capsunlocked/cu75/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/default_glow/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/post_rules.mk | 12 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/post_rules.mk | 12 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/rules.mk | 8 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol3/rules.mk | 8 |
6 files changed, 24 insertions, 22 deletions
diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk index 6274267ab1..d3979a9149 100644 --- a/keyboards/capsunlocked/cu75/rules.mk +++ b/keyboards/capsunlocked/cu75/rules.mk @@ -9,4 +9,6 @@ BOOTLOADER = atmel-dfu # BACKLIGHT_DRIVER = custom -SRC = ../lfkeyboards/TWIlib.c ../lfkeyboards/issi.c ../lfkeyboards/lighting.c +# TODO: These boards need to be converted to RGB Matrix +VPATH += keyboards/lfkeyboards +SRC = TWIlib.c issi.c lighting.c diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk index 360c3c51b8..20bac4ab9d 100644 --- a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk +++ b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk @@ -1,4 +1,4 @@ RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes # enable later -SRC += ../default/keymap.c +SRC += keymaps/default/keymap.c diff --git a/keyboards/hhkb/ansi/post_rules.mk b/keyboards/hhkb/ansi/post_rules.mk index bc6ad5cd4c..eb9a8f0adb 100644 --- a/keyboards/hhkb/ansi/post_rules.mk +++ b/keyboards/hhkb/ansi/post_rules.mk @@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT # HHKB Alt controller. -RN42_DIR = ../rn42 +RN42_DIR = keyboards/hhkb/rn42 SRC += serial_uart.c \ - ../rn42/suart.S \ - ../rn42/rn42.c \ - ../rn42/rn42_task.c \ - ../rn42/battery.c \ - ../rn42/main.c + suart.S \ + rn42.c \ + rn42_task.c \ + battery.c \ + main.c VPATH += $(RN42_DIR) diff --git a/keyboards/hhkb/jp/post_rules.mk b/keyboards/hhkb/jp/post_rules.mk index bc6ad5cd4c..eb9a8f0adb 100644 --- a/keyboards/hhkb/jp/post_rules.mk +++ b/keyboards/hhkb/jp/post_rules.mk @@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT # HHKB Alt controller. -RN42_DIR = ../rn42 +RN42_DIR = keyboards/hhkb/rn42 SRC += serial_uart.c \ - ../rn42/suart.S \ - ../rn42/rn42.c \ - ../rn42/rn42_task.c \ - ../rn42/battery.c \ - ../rn42/main.c + suart.S \ + rn42.c \ + rn42_task.c \ + battery.c \ + main.c VPATH += $(RN42_DIR) diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index d2ad9cdcc2..a682f3aa04 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -5,8 +5,9 @@ MCU = STM32F303 BOOTLOADER = stm32-dfu # Touch encoder needs -SRC += ../common/touch_encoder.c -SRC += ../common/common_oled.c +VPATH += keyboards/rgbkb/common +SRC += touch_encoder.c +SRC += common_oled.c QUANTUM_LIB_SRC += i2c_master.c # Build Options @@ -35,8 +36,7 @@ SERIAL_DRIVER = usart LTO_ENABLE = yes OPT = 3 -OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\" -OPT_DEFS += -Ikeyboards/rgbkb/common +OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\" # matrix optimisations SRC += matrix.c diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index 8389a7a9c4..e30330d333 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -5,8 +5,9 @@ MCU = STM32F303 BOOTLOADER = stm32-dfu # Touch encoder needs -SRC += ../common/touch_encoder.c -SRC += ../common/common_oled.c +VPATH += keyboards/rgbkb/common +SRC += touch_encoder.c +SRC += common_oled.c QUANTUM_LIB_SRC += i2c_master.c # Build Options @@ -39,8 +40,7 @@ SERIAL_DRIVER = usart LTO_ENABLE = yes OPT = 3 -OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\" -OPT_DEFS += -Ikeyboards/rgbkb/common +OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\" # TODO: Implement fast matrix scanning # matrix optimisations |