diff options
| author | Pablo MartÃnez <58857054+elpekenin@users.noreply.github.com> | 2023-09-25 06:17:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 14:17:50 +1000 |
| commit | 9b0887359bd6828a4071f7ce0dcd35eb0c8f98a1 (patch) | |
| tree | 77d6c5dbad47f072a85cb31e04e2f6799a1cf6e1 /builddefs/build_json.mk | |
| parent | 2563c9ba7fad5318db687bf98f1e5a0370614ad7 (diff) | |
[Feature] Compilation warning if both `keymap.json` and `keymap.c` exist (#19939)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'builddefs/build_json.mk')
| -rw-r--r-- | builddefs/build_json.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builddefs/build_json.mk b/builddefs/build_json.mk index 0c034eb2ae..e29d678e48 100644 --- a/builddefs/build_json.mk +++ b/builddefs/build_json.mk @@ -1,17 +1,17 @@ # Look for a json keymap file ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","") KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json - KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5) + KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_5) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","") KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json - KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4) + KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_4) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","") KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json - KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3) + KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_3) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","") KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json - KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2) + KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_2) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","") KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json - KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) + KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_1) endif |