diff options
| author | Joel Challis <git@zvecr.com> | 2021-08-18 21:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 21:52:41 +0100 |
| commit | 2e734fb6b9e3480854b794218d381559aab431b7 (patch) | |
| tree | 2bec5639b3dd200c640cd8c76b8c2b614f67e34b /build_layout.mk | |
| parent | 10fab4ec077354f41d19f01798a49e5864a189cd (diff) | |
| download | qmk_firmware-2e734fb6b9e3480854b794218d381559aab431b7.tar.gz qmk_firmware-2e734fb6b9e3480854b794218d381559aab431b7.zip | |
Add config.h and rules.mk support for data driven keymaps (#12859)
* Add config.h and rules.mk support for data driven keymaps
* tidy up after rebase
* Rename key as it can contain more than just keyboard overrides
* tidy up after rebase
* Add validation
Diffstat (limited to 'build_layout.mk')
| -rw-r--r-- | build_layout.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build_layout.mk b/build_layout.mk index 649dfb2c7..b4b00793e 100644 --- a/build_layout.mk +++ b/build_layout.mk | |||
| @@ -7,7 +7,6 @@ define SEARCH_LAYOUTS_REPO | |||
| 7 | LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c | 7 | LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c |
| 8 | ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","") | 8 | ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","") |
| 9 | -include $$(LAYOUT_KEYMAP_PATH)/rules.mk | 9 | -include $$(LAYOUT_KEYMAP_PATH)/rules.mk |
| 10 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c | ||
| 11 | KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON) | 10 | KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON) |
| 12 | KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) | 11 | KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) |
| 13 | else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") | 12 | else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") |
| @@ -31,7 +30,3 @@ ifneq ($(FORCE_LAYOUT),) | |||
| 31 | endif | 30 | endif |
| 32 | 31 | ||
| 33 | $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS))) | 32 | $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS))) |
| 34 | |||
| 35 | # Use rule from build_json.mk, but update prerequisite in case KEYMAP_JSON was updated | ||
| 36 | $(KEYMAP_C): $(KEYMAP_JSON) | ||
| 37 | $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) | ||
