diff options
| author | Donald Kjer <don.kjer@gmail.com> | 2021-06-19 15:30:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-19 15:30:23 -0700 |
| commit | 1272ecd73c218e5827116aa68ce8ce6a4b6df4ec (patch) | |
| tree | 38ebcec1c7fe11189dbc74d69b095cccd91a0b23 /build_json.mk | |
| parent | 7c5ef4060e32396ddcbf0fd2ea9a22f569a4e984 (diff) | |
| download | qmk_firmware-1272ecd73c218e5827116aa68ce8ce6a4b6df4ec.tar.gz qmk_firmware-1272ecd73c218e5827116aa68ce8ce6a4b6df4ec.zip | |
Fixing incorrect keymap build when switching between multiple keymap.jsons (#12632)
Diffstat (limited to 'build_json.mk')
| -rw-r--r-- | build_json.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build_json.mk b/build_json.mk index 8822be6a1..28659f260 100644 --- a/build_json.mk +++ b/build_json.mk | |||
| @@ -1,22 +1,22 @@ | |||
| 1 | # Look for a json keymap file | 1 | # Look for a json keymap file |
| 2 | ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","") | 2 | ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","") |
| 3 | KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c | 3 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 4 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json | 4 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json |
| 5 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5) | 5 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5) |
| 6 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","") | 6 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","") |
| 7 | KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c | 7 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 8 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json | 8 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json |
| 9 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4) | 9 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4) |
| 10 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","") | 10 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","") |
| 11 | KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c | 11 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 12 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json | 12 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json |
| 13 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3) | 13 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3) |
| 14 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","") | 14 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","") |
| 15 | KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c | 15 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 16 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json | 16 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json |
| 17 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2) | 17 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2) |
| 18 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","") | 18 | else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","") |
| 19 | KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c | 19 | KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c |
| 20 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json | 20 | KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json |
| 21 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) | 21 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) |
| 22 | endif | 22 | endif |
| @@ -27,5 +27,5 @@ ifneq ("$(wildcard $(KEYMAP_PATH))", "") | |||
| 27 | endif | 27 | endif |
| 28 | 28 | ||
| 29 | # Generate the keymap.c | 29 | # Generate the keymap.c |
| 30 | $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) | 30 | $(KEYMAP_C): $(KEYMAP_JSON) |
| 31 | $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) | 31 | $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) |
