Makefile changes to support emulator build

2016-05-16 09:45:39 +03:00 · 2016-05-16 09:45:39 +03:00 · 15bdef3ee9
parent 350bc0d22f
commit 15bdef3ee9
2 changed files with 7 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e221a690616e20f87e0b0088baffdbd5427be862
+Subproject commit 314a066d11f09d295d42054a0b53fa1a95c0ba0a
--- a/visualizer.mk
+++ b/visualizer.mk
@ -21,7 +21,9 @@
 # SOFTWARE.

 GFXLIB = $(VISUALIZER_DIR)/ugfx
+ifndef EMULATOR
 SRC += $(VISUALIZER_DIR)/visualizer.c
+endif
 UINCDIR += $(GFXINC) $(VISUALIZER_DIR)

 ifdef LCD_ENABLE
@ -45,9 +47,13 @@ endif
 ifdef USE_UGFX
 include $(GFXLIB)/gfx.mk
 SRC += $(GFXSRC)
+UDEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
+ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS)))
 endif

 ifndef VISUALIZER_USER
+ifndef EMULATOR
 VISUALIZER_USER = visualizer_user.c
 endif
+endif
 SRC += $(VISUALIZER_USER)