diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-10-14 11:32:19 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 11:32:19 -1000 |
| commit | 800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch) | |
| tree | 718e43d976bc71627558b5f9e1b657e8a64e4131 /quantum/visualizer | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
| download | qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.zip | |
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/visualizer')
| -rw-r--r-- | quantum/visualizer/visualizer.mk | 32 |
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)" | |||
| 93 | ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") | 93 | ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") |
| 94 | SRC += $(KEYMAP_PATH)/visualizer.c | 94 | SRC += $(KEYMAP_PATH)/visualizer.c |
| 95 | else | 95 | else |
| 96 | ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/visualizer.c)","") | 96 | VISUALIZER_1 := $(KEYBOARD_PATH_1)/visualizer.c |
| 97 | ifeq ("$(wildcard $(SUBPROJECT_PATH)/visualizer.c)","") | 97 | VISUALIZER_2 := $(KEYBOARD_PATH_2)/visualizer.c |
| 98 | ifeq ("$(wildcard $(KEYBOARD_PATH)/visualizer.c)","") | 98 | VISUALIZER_3 := $(KEYBOARD_PATH_3)/visualizer.c |
| 99 | $(error "visualizer.c" not found") | 99 | VISUALIZER_4 := $(KEYBOARD_PATH_4)/visualizer.c |
| 100 | else | 100 | VISUALIZER_5 := $(KEYBOARD_PATH_5)/visualizer.c |
| 101 | SRC += keyboards/$(KEYBOARD)/visualizer.c | 101 | |
| 102 | endif | 102 | ifneq ("$(wildcard $(VISUALIZER_5))","") |
| 103 | else | 103 | SRC += $(VISUALIZER_5) |
| 104 | SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/visualizer.c | 104 | endif |
| 105 | endif | 105 | ifneq ("$(wildcard $(VISUALIZER_4))","") |
| 106 | else | 106 | SRC += $(VISUALIZER_4) |
| 107 | SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/visualizer.c | 107 | endif |
| 108 | ifneq ("$(wildcard $(VISUALIZER_3))","") | ||
| 109 | SRC += $(VISUALIZER_3) | ||
| 110 | endif | ||
| 111 | ifneq ("$(wildcard $(VISUALIZER_2))","") | ||
| 112 | SRC += $(VISUALIZER_2) | ||
| 113 | endif | ||
| 114 | ifneq ("$(wildcard $(VISUALIZER_1))","") | ||
| 115 | SRC += $(VISUALIZER_1) | ||
| 108 | endif | 116 | endif |
| 109 | endif | 117 | endif |
| 110 | 118 | ||