Fix some makefile issues, and symbol issues
This commit is contained in:
parent
74baa4895c
commit
6313cfd559
2 changed files with 12 additions and 6 deletions
|
@ -77,8 +77,8 @@ static remote_object_t* remote_objects[] = {
|
|||
|
||||
#endif
|
||||
|
||||
GDisplay* LCDDisplay;
|
||||
GDisplay* LEDDisplay;
|
||||
GDisplay* LCD_DISPLAY = 0;
|
||||
GDisplay* LED_DISPLAY = 0;
|
||||
|
||||
|
||||
void start_keyframe_animation(keyframe_animation_t* animation) {
|
||||
|
@ -437,8 +437,8 @@ void visualizer_init(void) {
|
|||
add_remote_objects(remote_objects, sizeof(remote_objects) / sizeof(remote_object_t*) );
|
||||
#endif
|
||||
// TODO: Make sure these works when either of these are disabled
|
||||
LCDDisplay = gdispGetDisplay(0);
|
||||
LEDDisplay = gdispGetDisplay(1);
|
||||
LCD_DISPLAY = gdispGetDisplay(0);
|
||||
LED_DISPLAY = gdispGetDisplay(1);
|
||||
|
||||
|
||||
// We are using a low priority thread, the idea is to have it run only
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
# SOFTWARE.
|
||||
|
||||
GFXLIB = $(VISUALIZER_DIR)/ugfx
|
||||
SRC += $(GFXSRC) $(VISUALIZER_DIR)/visualizer.c
|
||||
SRC += $(VISUALIZER_DIR)/visualizer.c
|
||||
UINCDIR += $(GFXINC) $(VISUALIZER_DIR)
|
||||
|
||||
ifdef LCD_ENABLE
|
||||
include $(GFXLIB)/gfx.mk
|
||||
UDEFS += -DLCD_ENABLE
|
||||
ULIBS += -lm
|
||||
USE_UGFX = yes
|
||||
endif
|
||||
|
||||
ifdef LCD_BACKLIGHT_ENABLE
|
||||
|
@ -39,6 +39,12 @@ 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)
|
||||
endif
|
||||
|
||||
ifndef VISUALIZER_USER
|
||||
|
|
Loading…
Reference in a new issue