diff options
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_keyboard.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index ccd7e50b05..afad67a76d 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk | |||
| @@ -186,7 +186,10 @@ endif | |||
| 186 | # Have we found a keymap.json? | 186 | # Have we found a keymap.json? |
| 187 | ifneq ("$(wildcard $(KEYMAP_JSON))", "") | 187 | ifneq ("$(wildcard $(KEYMAP_JSON))", "") |
| 188 | ifneq ("$(wildcard $(KEYMAP_C))", "") | 188 | ifneq ("$(wildcard $(KEYMAP_C))", "") |
| 189 | $(call WARNING_MESSAGE,Keymap is specified as both keymap.json and keymap.c -- keymap.json file wins.) | 189 | # Allow a separately-found keymap.c next to keymap.json -- the keymap.c |
| 190 | # generator will include the other keymap.c in the process, if supplied. | ||
| 191 | OTHER_KEYMAP_C := $(KEYMAP_C) | ||
| 192 | OPT_DEFS += -DOTHER_KEYMAP_C=\"$(OTHER_KEYMAP_C)\" | ||
| 190 | endif | 193 | endif |
| 191 | 194 | ||
| 192 | KEYMAP_PATH := $(KEYMAP_JSON_PATH) | 195 | KEYMAP_PATH := $(KEYMAP_JSON_PATH) |