Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
45397a44e3
1 changed files with 0 additions and 3 deletions
|
@ -35,15 +35,12 @@ endif
|
|||
|
||||
# Force expansion
|
||||
override TARGET := $(TARGET)
|
||||
$(info TARGET=$(TARGET))
|
||||
|
||||
ifneq ($(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
|
||||
|
|
Loading…
Reference in a new issue