diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-28 23:25:39 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2017-04-09 18:34:59 +0300 |
| commit | f5c89416527a3ec435ed49137fd2bf4af216024c (patch) | |
| tree | aef2532c7f770c8ab67c52e717aeff7e58c5bf7d | |
| parent | bb86be1f1f3927a7ce339cb9439c97914af24754 (diff) | |
| download | qmk_firmware-f5c89416527a3ec435ed49137fd2bf4af216024c.tar.gz qmk_firmware-f5c89416527a3ec435ed49137fd2bf4af216024c.zip | |
UGFX is compiled once per keyboard instead of keymap
| -rw-r--r-- | build_keyboard.mk | 8 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h | 2 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.mk | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 82464d583..ad92892e2 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
| @@ -258,12 +258,12 @@ endif | |||
| 258 | 258 | ||
| 259 | OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) | 259 | OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) |
| 260 | $(KEYMAP_OUTPUT)_SRC := $(SRC) | 260 | $(KEYMAP_OUTPUT)_SRC := $(SRC) |
| 261 | $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" | 261 | $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" |
| 262 | $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) | 262 | $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) |
| 263 | $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) | 263 | $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) |
| 264 | $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) | 264 | $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC) |
| 265 | $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) | 265 | $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(GFXDEFS) |
| 266 | $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) | 266 | $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC) |
| 267 | $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) | 267 | $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) |
| 268 | 268 | ||
| 269 | # Default target. | 269 | # Default target. |
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index 290571ce5..abda0bd85 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #ifndef _GDISP_LLD_BOARD_H | 8 | #ifndef _GDISP_LLD_BOARD_H |
| 9 | #define _GDISP_LLD_BOARD_H | 9 | #define _GDISP_LLD_BOARD_H |
| 10 | 10 | ||
| 11 | #include "print.h" | ||
| 12 | |||
| 13 | #define ST7565_LCD_BIAS ST7565_LCD_BIAS_9 // actually 6 | 11 | #define ST7565_LCD_BIAS ST7565_LCD_BIAS_9 // actually 6 |
| 14 | #define ST7565_ADC ST7565_ADC_NORMAL | 12 | #define ST7565_ADC ST7565_ADC_NORMAL |
| 15 | #define ST7565_COM_SCAN ST7565_COM_SCAN_DEC | 13 | #define ST7565_COM_SCAN ST7565_COM_SCAN_DEC |
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index ecdeba1ee..8f5fb8933 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk | |||
| @@ -43,8 +43,8 @@ OPT_DEFS += -DLED_ENABLE | |||
| 43 | endif | 43 | endif |
| 44 | 44 | ||
| 45 | include $(GFXLIB)/gfx.mk | 45 | include $(GFXLIB)/gfx.mk |
| 46 | SRC += $(patsubst $(TOP_DIR)/%,%,$(GFXSRC)) | 46 | GFXSRC := $(patsubst $(TOP_DIR)/%,%,$(GFXSRC)) |
| 47 | OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) | 47 | GFXDEFS := $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) |
| 48 | 48 | ||
| 49 | ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") | 49 | ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") |
| 50 | SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c | 50 | SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c |