summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-05-16 09:45:39 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-05-16 09:45:39 +0300
commit15bdef3ee92e6809ec5d0f25901f4a490cd91b58 (patch)
tree6dce5f97fb5e6d35a976de26ade313daff11d18b
parent350bc0d22f76f362ecf8024a9f5af799e890a223 (diff)
Makefile changes to support emulator build
m---------ugfx0
-rw-r--r--visualizer.mk6
2 files changed, 6 insertions, 0 deletions
diff --git a/ugfx b/ugfx
-Subproject e221a690616e20f87e0b0088baffdbd5427be86
+Subproject 314a066d11f09d295d42054a0b53fa1a95c0ba0
diff --git a/visualizer.mk b/visualizer.mk
index 5cc199cf48..c51f8ba5d4 100644
--- 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) \ No newline at end of file