diff options
| author | Erovia <Erovia@users.noreply.github.com> | 2020-04-18 15:29:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 14:29:48 +0100 |
| commit | 46a84ec84a09b33f2df88efb2fc303e77b2d842f (patch) | |
| tree | 110357a2a22bd422cb1e0f435bf73bfdc610776c | |
| parent | 3b5998085c62253a36b3a5c109207646570aa7f4 (diff) | |
| download | qmk_firmware-46a84ec84a09b33f2df88efb2fc303e77b2d842f.tar.gz qmk_firmware-46a84ec84a09b33f2df88efb2fc303e77b2d842f.zip | |
Load keymap-level rules.mk when compiling keymap.json (#8841)
| -rw-r--r-- | build_json.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_json.mk b/build_json.mk index 087944cc4..6e2f9c4c8 100644 --- a/build_json.mk +++ b/build_json.mk | |||
| @@ -21,6 +21,11 @@ else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","") | |||
| 21 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) | 21 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) |
| 22 | endif | 22 | endif |
| 23 | 23 | ||
| 24 | # Load the keymap-level rules.mk if exists | ||
| 25 | ifneq ("$(wildcard $(KEYMAP_PATH))", "") | ||
| 26 | -include $(KEYMAP_PATH)/rules.mk | ||
| 27 | endif | ||
| 28 | |||
| 24 | # Generate the keymap.c | 29 | # Generate the keymap.c |
| 25 | $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) | 30 | $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) |
| 26 | bin/qmk json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) | 31 | bin/qmk json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) |