Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Change order of variable assignment

Browse source 
BUILD_DIR and TARGET was assigned too late, so the dfu-util target,
which depends on them did not work.
This commit is contained in:
Fred Sundvik 2016-08-21 13:53:36 +03:00
parent 1c69acb7d5
commit 8f16403179
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build_keyboard.mk
View file

@ -16,6 +16,19 @@ LIB_PATH = $(TOP_DIR)/lib
QUANTUM_DIR = quantum QUANTUM_DIR = quantum
QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
BUILD_DIR := $(TOP_DIR)/.build
ifneq ($(SUBPROJECT),)
TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT)
else
TARGET ?= $(KEYBOARD)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)
endif
# Force expansion
TARGET := $(TARGET)
MASTER ?= left MASTER ?= left
ifdef master ifdef master
@ -93,15 +106,6 @@ else
$(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist) $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist)
endif endif
BUILD_DIR = $(TOP_DIR)/.build
ifneq ($(SUBPROJECT),)
TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT)
else
TARGET ?= $(KEYBOARD)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)
endif
# Object files directory # Object files directory
# To put object files in current directory, use a dot (.), do NOT make # To put object files in current directory, use a dot (.), do NOT make