diff options
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index ec6b026c5..91a6c23b7 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -12,6 +12,9 @@ endif | |||
12 | 12 | ||
13 | include common.mk | 13 | include common.mk |
14 | 14 | ||
15 | # Set the qmk cli to use | ||
16 | QMK_BIN ?= qmk | ||
17 | |||
15 | # Set the filename for the final firmware binary | 18 | # Set the filename for the final firmware binary |
16 | KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD)) | 19 | KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD)) |
17 | TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP) | 20 | TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP) |
@@ -97,7 +100,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP) | |||
97 | MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP) | 100 | MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP) |
98 | 101 | ||
99 | # Pull in rules from info.json | 102 | # Pull in rules from info.json |
100 | INFO_RULES_MK = $(shell bin/qmk generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk) | 103 | INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk) |
101 | include $(INFO_RULES_MK) | 104 | include $(INFO_RULES_MK) |
102 | 105 | ||
103 | # Check for keymap.json first, so we can regenerate keymap.c | 106 | # Check for keymap.json first, so we can regenerate keymap.c |
@@ -295,13 +298,13 @@ endif | |||
295 | CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | 298 | CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h |
296 | 299 | ||
297 | $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES) | 300 | $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES) |
298 | bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h | 301 | $(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h |
299 | 302 | ||
300 | $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES) | 303 | $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES) |
301 | bin/qmk generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h | 304 | $(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h |
302 | 305 | ||
303 | $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES) | 306 | $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES) |
304 | bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h | 307 | $(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h |
305 | 308 | ||
306 | generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h | 309 | generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h |
307 | 310 | ||