diff options
author | Joel Challis <git@zvecr.com> | 2021-05-01 02:00:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-01 02:00:04 +0100 |
commit | fc2b51194c58140b096b4c953c703b7f3f6f1fbc (patch) | |
tree | c0594513f50a37881ee31d794aba29a053717376 /build_keyboard.mk | |
parent | 18dc12cd78448bffe4ad54aa15aa715ee959e64c (diff) | |
download | qmk_firmware-fc2b51194c58140b096b4c953c703b7f3f6f1fbc.tar.gz qmk_firmware-fc2b51194c58140b096b4c953c703b7f3f6f1fbc.zip |
Allow <keyboard>.h to be optional when going data driven (#12706)
* Allow <keyboard>.h to be optional when going data driven
* Remove stub files as no longer required
* Rename function
* Remove include of layouts.h for now
* Take advantage of type=keyboard_folder
* Take advantage of type=keyboard_folder - kb should still be mandatory
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 366d1f5d2..ec6b026c5 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -205,6 +205,7 @@ endif | |||
205 | # | 205 | # |
206 | # https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic | 206 | # https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic |
207 | # | 207 | # |
208 | QMK_KEYBOARD_H = $(KEYBOARD_OUTPUT)/src/default_keyboard.h | ||
208 | ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","") | 209 | ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","") |
209 | QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h | 210 | QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h |
210 | endif | 211 | endif |
@@ -296,10 +297,13 @@ CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts. | |||
296 | $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES) | 297 | $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES) |
297 | bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h | 298 | bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h |
298 | 299 | ||
300 | $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES) | ||
301 | bin/qmk generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h | ||
302 | |||
299 | $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES) | 303 | $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES) |
300 | bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h | 304 | bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h |
301 | 305 | ||
302 | generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | 306 | generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h |
303 | 307 | ||
304 | .INTERMEDIATE : generated-files | 308 | .INTERMEDIATE : generated-files |
305 | 309 | ||