projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo.
[bertos.git]
/
examples
/
demo
/
demo.mk
diff --git
a/examples/demo/demo.mk
b/examples/demo/demo.mk
index cef81a26eca0b6500e300c11dc0ed95751ff793a..db4f82e79508128a24ba36c1257287f30fa99188 100644
(file)
--- a/
examples/demo/demo.mk
+++ b/
examples/demo/demo.mk
@@
-14,12
+14,14
@@
include bertos/emul/emul.mk
# Set to 1 for debug builds
demo_DEBUG = 1
# Set to 1 for debug builds
demo_DEBUG = 1
+# This is an hosted application
+demo_HOSTED = 1
+
# Our target application
TRG += demo
# Our target application
TRG += demo
-# FIXME: we want to use g++ for C source too
-CC = g++
-CXX = g++
+#We want to use g++ for C source too
+demo_CC=g++
demo_CXXSRC = \
bertos/emul/emul.cpp \
demo_CXXSRC = \
bertos/emul/emul.cpp \
@@
-46,6
+48,7
@@
demo_CSRC = \
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 \
+ bertos/emul/kfile_posix.c \
bertos/mware/formatwr.c \
bertos/mware/hex.c \
bertos/mware/event.c \
bertos/mware/formatwr.c \
bertos/mware/hex.c \
bertos/mware/event.c \
@@
-63,7
+66,7
@@
demo_CSRC = \
bertos/verstag.c
demo_CPPASRC = \
bertos/verstag.c
demo_CPPASRC = \
- bertos/emul/switch.S
+ bertos/emul/switch
_ctx_emul
.S
# FIXME: maybe this junk should go in emul/emul.mk?
$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp
# FIXME: maybe this junk should go in emul/emul.mk?
$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp