diff options
author | Nick Brassel <[email protected]> | 2024-04-10 19:03:11 +1000 |
---|---|---|
committer | GitHub <[email protected]> | 2024-04-10 19:03:11 +1000 |
commit | 4acdddbf48707e5221cb754b4aa5caf32ce28276 (patch) | |
tree | 2d0614d0cd5aec08a44eca535cf47379dc3ffee7 /builddefs/build_keyboard.mk | |
parent | b99143fdd2637f573bb8c2632a38b84acc1945a0 (diff) | |
download | qmk_firmware-4acdddbf48707e5221cb754b4aa5caf32ce28276.tar.gz qmk_firmware-4acdddbf48707e5221cb754b4aa5caf32ce28276.zip |
Bodge consolidation. (#23448)
Diffstat (limited to 'builddefs/build_keyboard.mk')
-rw-r--r-- | builddefs/build_keyboard.mk | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 0b9ab8849f..f0788e55c9 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -521,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes) OPT_DEFS += -save-temps=obj endif -# TODO: remove this bodge? -PROJECT_DEFS := $(OPT_DEFS) -PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) -PROJECT_CONFIG := $(CONFIG_H) - -CONFIG_H += $(POST_CONFIG_H) -ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H) - OUTPUTS := $(INTERMEDIATE_OUTPUT) $(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC) -$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \ +$(INTERMEDIATE_OUTPUT)_DEFS := \ -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \ -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \ - $(PROJECT_DEFS) -$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC) -$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG) + $(OPT_DEFS) +$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) +$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H) # Default target. all: build check-size |