forked from forks/qmk_firmware
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8a5ad2a113
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
KEYBOARD_LOCAL_FEATURES_MK :=
|
KEYBOARD_LOCAL_FEATURES_MK :=
|
||||||
-include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
|
-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
|
||||||
|
|
||||||
# Parse 'HELIX=xx,yy,zz' option
|
# Parse 'HELIX=xx,yy,zz' option
|
||||||
ifneq ($(strip $(HELIX)),)
|
ifneq ($(strip $(HELIX)),)
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
$(info -------------------------)
|
ifneq ($(strip $(HELIX)),)
|
||||||
$(info override_helix_options.mk)
|
$(info -------------------------)
|
||||||
$(info -------------------------)
|
$(info override_helix_options.mk)
|
||||||
|
$(info -------------------------)
|
||||||
|
endif
|
||||||
|
|
||||||
define HELIX_OVERRIDE_PARSE
|
define HELIX_OVERRIDE_PARSE
|
||||||
ifeq ($(strip $1),back)
|
ifeq ($(strip $1),back)
|
||||||
|
|
Loading…
Reference in a new issue