diff options
author | QMK Bot <[email protected]> | 2024-08-12 12:34:54 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2024-08-12 12:34:54 +0000 |
commit | 2c6409fdd8deed5b10410b5e9a74748499e0739c (patch) | |
tree | 240efdcdff73fa87a47c5cd9b87b63a7b9263291 /builddefs/build_keyboard.mk | |
parent | 783f97ff32de1d6febceb09f46dfa624e4fc56ec (diff) | |
parent | 380e0c9cad72ac29f858bef85c8b8eb35b6931f0 (diff) | |
download | qmk_firmware-2c6409fdd8deed5b10410b5e9a74748499e0739c.tar.gz qmk_firmware-2c6409fdd8deed5b10410b5e9a74748499e0739c.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'builddefs/build_keyboard.mk')
-rw-r--r-- | builddefs/build_keyboard.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index ebc52a9309..ad81b85a27 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -34,10 +34,16 @@ ifeq ($(strip $(DUMP_CI_METADATA)),yes) endif # Force expansion -TARGET := $(TARGET) +override TARGET := $(TARGET) +$(info TARGET=$(TARGET)) ifneq ($(FORCE_LAYOUT),) - TARGET := $(TARGET)_$(FORCE_LAYOUT) + override TARGET := $(TARGET)_$(FORCE_LAYOUT) + $(info TARGET=$(TARGET)) +endif +ifneq ($(CONVERT_TO),) + override TARGET := $(TARGET)_$(CONVERT_TO) + $(info TARGET=$(TARGET)) endif # Object files and generated keymap directory @@ -58,9 +64,6 @@ ifdef SKIP_GIT VERSION_H_FLAGS += --skip-git endif -# Generate the board's version.h file. -$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h) - # Determine which subfolders exist. KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD) KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1))) @@ -223,6 +226,9 @@ endif include $(BUILDDEFS_PATH)/converters.mk +# Generate the board's version.h file. +$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h) + MCU_ORIG := $(MCU) include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk) |