summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-06 23:20:20 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-07-06 23:20:20 +0200
commit70797bb8f21c72cba15b314b2d0a6684bfedc369 (patch)
tree988c9464320f49d71037df05ecee443ba4282125 /quantum
parent10f3a1b6215af2a1c74b0245e46f5b6352ee18a4 (diff)
downloadqmk_firmware-70797bb8f21c72cba15b314b2d0a6684bfedc369.tar.gz
qmk_firmware-70797bb8f21c72cba15b314b2d0a6684bfedc369.tar.xz
Makefile changes and files to compile Visualizer
Diffstat (limited to 'quantum')
-rw-r--r--quantum/visualizer/visualizer.c2
-rw-r--r--quantum/visualizer/visualizer.h2
-rw-r--r--quantum/visualizer/visualizer.mk22
3 files changed, 11 insertions, 15 deletions
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index c24073405..abca22d85 100644
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -29,9 +29,7 @@ SOFTWARE.
#include "ch.h"
#endif
-#ifdef LCD_ENABLE
#include "gfx.h"
-#endif
#ifdef LCD_BACKLIGHT_ENABLE
#include "lcd_backlight.h"
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h
index 45cfa9aa9..53e250725 100644
--- a/quantum/visualizer/visualizer.h
+++ b/quantum/visualizer/visualizer.h
@@ -28,9 +28,7 @@ SOFTWARE.
#include <stdint.h>
#include <stdbool.h>
-#ifdef LCD_ENABLE
#include "gfx.h"
-#endif
#ifdef LCD_BACKLIGHT_ENABLE
#include "lcd_backlight.h"
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 56525ffd9..b5dfad8e1 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -20,14 +20,14 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-GFXLIB = $(VISUALIZER_DIR)/ugfx
SRC += $(VISUALIZER_DIR)/visualizer.c
-UINCDIR += $(GFXINC) $(VISUALIZER_DIR)
+EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR)
+GFXLIB = $(LIB_PATH)/ugfx
+VPATH += $(VISUALIZER_PATH)
ifdef LCD_ENABLE
-UDEFS += -DLCD_ENABLE
+OPT_DEFS += -DLCD_ENABLE
ULIBS += -lm
-USE_UGFX = yes
endif
ifdef LCD_BACKLIGHT_ENABLE
@@ -35,21 +35,21 @@ SRC += $(VISUALIZER_DIR)/lcd_backlight.c
ifndef EMULATOR
SRC += lcd_backlight_hal.c
endif
-UDEFS += -DLCD_BACKLIGHT_ENABLE
+OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
endif
ifdef LED_ENABLE
SRC += $(VISUALIZER_DIR)/led_test.c
UDEFS += -DLED_ENABLE
-USE_UGFX = yes
endif
-ifdef USE_UGFX
include $(GFXLIB)/gfx.mk
-SRC += $(GFXSRC)
-UDEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
-ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS)))
-endif
+#SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c)
+#SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
+#SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC))
+#SRC += $(GFXSRC)
+OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
+#ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS)))
ifndef VISUALIZER_USER
VISUALIZER_USER = visualizer_user.c