projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
monitor: use %zu to print size_t arguments to pacify gcc
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index b69a9a62f7cd1dcc3ef45d32e919d7836532737b..eab6c3cb5e48d3c5b4f3ec1fa29180141ec55db3 100644
(file)
--- a/
app/demo/demo.mk
+++ b/
app/demo/demo.mk
@@
-11,9
+11,6
@@
include bertos/fonts/fonts.mk
include bertos/emul/emul.mk
include bertos/fonts/fonts.mk
include bertos/emul/emul.mk
-#Demo application is hosted
-demo_EMBEDDED_TGT = 0
-
# Set to 1 for debug builds
demo_DEBUG = 1
# Set to 1 for debug builds
demo_DEBUG = 1
@@
-44,6
+41,7
@@
demo_CSRC = \
bertos/icons/logo.c \
bertos/drv/kbd.c \
bertos/drv/timer.c \
bertos/icons/logo.c \
bertos/drv/kbd.c \
bertos/drv/timer.c \
+ bertos/drv/timer_test.c \
bertos/drv/buzzer.c \
bertos/drv/ser.c \
bertos/emul/ser_posix.c \
bertos/drv/buzzer.c \
bertos/drv/ser.c \
bertos/emul/ser_posix.c \
@@
-74,17
+72,12
@@
bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
$(QT_MOC) -o $@ $<
$(QT_MOC) -o $@ $<
-demo_CFLAGS = -
D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ibertos/emul
$(EMUL_CFLAGS)
-demo_CXXFLAGS = -
D_QT=4 -D'ARCH=ARCH_EMUL' -
Iapp/demo $(EMUL_CFLAGS)
+demo_CFLAGS = -
Iapp/demo
$(EMUL_CFLAGS)
+demo_CXXFLAGS = -Iapp/demo $(EMUL_CFLAGS)
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
-ifeq ($(demo_DEBUG),1)
- demo_CFLAGS += -D_DEBUG
- demo_CXXFLAGS += -D_DEBUG
- demo_CSRC += bertos/drv/kdebug.c
-else
+ifeq ($(demo_DEBUG),0)
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
-