X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=examples%2Fdemo%2Fdemo.mk;h=b9ded303b5459801e54ff593bfe1c272638f45b3;hb=bbc9b62788f5e2f94dd550708a6af22f6d49eb98;hp=504d80fab9e64834a18ffa725b627e43c33a0a30;hpb=24c21c92d29b76a3f0de0a107f4bafef7bb0f812;p=bertos.git

diff --git a/examples/demo/demo.mk b/examples/demo/demo.mk
index 504d80fa..b9ded303 100644
--- 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
 
+# This is an hosted application
+demo_HOSTED = 1
+
 # 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 \
@@ -46,15 +48,15 @@ demo_CSRC = \
 	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/observer.c \
 	bertos/mware/resource.c \
 	bertos/mware/sprintf.c \
-	bertos/kern/idle.c \
+	bertos/struct/heap.c \
 	bertos/kern/irq.c \
-	bertos/kern/preempt.c \
 	bertos/kern/proc.c \
 	bertos/kern/proc_test.c \
 	bertos/kern/sem.c \
@@ -63,10 +65,14 @@ demo_CSRC = \
 	bertos/verstag.c
 
 demo_CPPASRC = \
-	bertos/emul/switch.S
+	bertos/emul/switch_ctx_emul.S
+
+# Remove warnings generated by g++
+C_WARNFLAGS =
+C_COMPILER_STD =
 
 # FIXME: maybe this junk should go in emul/emul.mk?
-$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp 
+$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp
 $(OBJDIR)/demo/bertos/drv/lcd_gfx_qt.o: bertos/drv/lcd_gfx_qt_moc.cpp
 $(OBJDIR)/demo/bertos/drv/timer.o: bertos/emul/timer_qt_moc.cpp
 $(OBJDIR)/demo/bertos/emul/emulkbd.o: bertos/emul/emulkbd_moc.cpp
@@ -76,8 +82,9 @@ bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
 	$(QT_MOC) -o $@ $<
 
 
-demo_CFLAGS = -Iexamples/demo $(EMUL_CFLAGS)
-demo_CXXFLAGS = -Iexamples/demo $(EMUL_CFLAGS)
+demo_CPPAFLAGS =
+demo_CFLAGS = -O0 -g3 -ggdb -Iexamples/demo $(EMUL_CFLAGS)
+demo_CXXFLAGS = -O0 -g3 -ggdb -Iexamples/demo $(EMUL_CFLAGS)
 demo_LDFLAGS = $(EMUL_LDFLAGS)
 
 # Debug stuff