diff options
| author | Joakim Tufvegren <jocke@barbanet.com> | 2021-06-27 04:52:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 12:52:38 +1000 |
| commit | ed56fc7da155d61848bb5b1801ff33379b114c2b (patch) | |
| tree | 6f1c871ef2407fde83fb20f55297d7ad09702c14 | |
| parent | 023b85db96c7b5fc343a6ae7425f7a7b9ced8969 (diff) | |
| download | qmk_firmware-ed56fc7da155d61848bb5b1801ff33379b114c2b.tar.gz qmk_firmware-ed56fc7da155d61848bb5b1801ff33379b114c2b.zip | |
Fix building layouts from JSON (#13310)
Broken by #12632.
| -rw-r--r-- | build_layout.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_layout.mk b/build_layout.mk index 4748ad483..649dfb2c7 100644 --- a/build_layout.mk +++ b/build_layout.mk | |||
| @@ -7,7 +7,7 @@ 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 := $(KEYBOARD_OUTPUT)/src/keymap.c | 10 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 11 | KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON) | 11 | KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON) |
| 12 | KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) | 12 | KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) |
| 13 | else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") | 13 | else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") |
| @@ -33,4 +33,5 @@ endif | |||
| 33 | $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS))) | 33 | $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS))) |
| 34 | 34 | ||
| 35 | # Use rule from build_json.mk, but update prerequisite in case KEYMAP_JSON was updated | 35 | # Use rule from build_json.mk, but update prerequisite in case KEYMAP_JSON was updated |
| 36 | $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) | 36 | $(KEYMAP_C): $(KEYMAP_JSON) |
| 37 | $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) | ||