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

diff --git a/examples/demo/demo.mk b/examples/demo/demo.mk
index 504d80fa..733b52c5 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 \
@@ -54,7 +56,7 @@ demo_CSRC = \
 	bertos/mware/sprintf.c \
 	bertos/kern/idle.c \
 	bertos/kern/irq.c \
-	bertos/kern/preempt.c \
+	bertos/kern/coop.c \
 	bertos/kern/proc.c \
 	bertos/kern/proc_test.c \
 	bertos/kern/sem.c \
@@ -63,10 +65,10 @@ demo_CSRC = \
 	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 
+$(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 +78,8 @@ 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_CFLAGS = -O0 -g3 -ggdb -Iexamples/demo $(EMUL_CFLAGS)
+demo_CXXFLAGS = -O0 -g3 -ggdb -Iexamples/demo $(EMUL_CFLAGS)
 demo_LDFLAGS = $(EMUL_LDFLAGS)
 
 # Debug stuff