Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
45397a44e3
@ -35,15 +35,12 @@ endif
|
|||||||
|
|
||||||
# Force expansion
|
# Force expansion
|
||||||
override TARGET := $(TARGET)
|
override TARGET := $(TARGET)
|
||||||
$(info TARGET=$(TARGET))
|
|
||||||
|
|
||||||
ifneq ($(FORCE_LAYOUT),)
|
ifneq ($(FORCE_LAYOUT),)
|
||||||
override TARGET := $(TARGET)_$(FORCE_LAYOUT)
|
override TARGET := $(TARGET)_$(FORCE_LAYOUT)
|
||||||
$(info TARGET=$(TARGET))
|
|
||||||
endif
|
endif
|
||||||
ifneq ($(CONVERT_TO),)
|
ifneq ($(CONVERT_TO),)
|
||||||
override TARGET := $(TARGET)_$(CONVERT_TO)
|
override TARGET := $(TARGET)_$(CONVERT_TO)
|
||||||
$(info TARGET=$(TARGET))
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Object files and generated keymap directory
|
# Object files and generated keymap directory
|
||||||
|
Loading…
Reference in New Issue
Block a user