summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-10-14 23:32:19 +0200
committerGitHub <noreply@github.com>2017-10-14 23:32:19 +0200
commit800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch)
tree718e43d976bc71627558b5f9e1b657e8a64e4131 /quantum
parente5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff)
downloadqmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz
qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.xz
Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now
Diffstat (limited to 'quantum')
-rw-r--r--quantum/visualizer/visualizer.mk32
1 files changed, 20 insertions, 12 deletions
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 671b63ea2..3bf3f7de6 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -93,18 +93,26 @@ GFXDEFS +=-DGDISP_DRIVER_LIST="$(GDISP_DRIVER_LIST)"
ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","")
SRC += $(KEYMAP_PATH)/visualizer.c
else
- ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/visualizer.c)","")
- ifeq ("$(wildcard $(SUBPROJECT_PATH)/visualizer.c)","")
- ifeq ("$(wildcard $(KEYBOARD_PATH)/visualizer.c)","")
-$(error "visualizer.c" not found")
- else
- SRC += keyboards/$(KEYBOARD)/visualizer.c
- endif
- else
- SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/visualizer.c
- endif
- else
- SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/visualizer.c
+ VISUALIZER_1 := $(KEYBOARD_PATH_1)/visualizer.c
+ VISUALIZER_2 := $(KEYBOARD_PATH_2)/visualizer.c
+ VISUALIZER_3 := $(KEYBOARD_PATH_3)/visualizer.c
+ VISUALIZER_4 := $(KEYBOARD_PATH_4)/visualizer.c
+ VISUALIZER_5 := $(KEYBOARD_PATH_5)/visualizer.c
+
+ ifneq ("$(wildcard $(VISUALIZER_5))","")
+ SRC += $(VISUALIZER_5)
+ endif
+ ifneq ("$(wildcard $(VISUALIZER_4))","")
+ SRC += $(VISUALIZER_4)
+ endif
+ ifneq ("$(wildcard $(VISUALIZER_3))","")
+ SRC += $(VISUALIZER_3)
+ endif
+ ifneq ("$(wildcard $(VISUALIZER_2))","")
+ SRC += $(VISUALIZER_2)
+ endif
+ ifneq ("$(wildcard $(VISUALIZER_1))","")
+ SRC += $(VISUALIZER_1)
endif
endif