X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=920f2a6a7074ea97dfdab7777a8968010e31f2e0;hb=cf6017f59fb2ff71423c716ad9d9f60a1b65c7d0;hp=6b78790d110d997f70aad3c21dc64fac6a3ef74b;hpb=9af02f30b0bcd97dce7ca6c20f12835a2c50f1f7;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 6b78790d..920f2a6a 100644
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -1,11 +1,11 @@
 #
-# $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
 # Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
+# Copyright 2008 Bernie Innocenti <bernie@codewiz.org>
 #
 # Makefile fragment for DevLib demo application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Version: $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 
 include bertos/fonts/fonts.mk
@@ -18,7 +18,8 @@ demo_DEBUG = 1
 TRG += demo
 
 # FIXME: we want to use g++ for C source too
-CC = g++
+CC = g++-4.3
+CXX = g++-4.3
 
 demo_CXXSRC = \
 	bertos/emul/emul.cpp \
@@ -41,6 +42,7 @@ demo_CSRC = \
 	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 \
@@ -50,38 +52,36 @@ demo_CSRC = \
 	bertos/mware/observer.c \
 	bertos/mware/resource.c \
 	bertos/mware/sprintf.c \
+	bertos/kern/idle.c \
+	bertos/kern/irq.c \
+	bertos/kern/preempt.c \
 	bertos/kern/proc.c \
+	bertos/kern/proc_test.c \
 	bertos/kern/sem.c \
 	bertos/kern/signal.c \
 	bertos/kern/monitor.c \
-	bertos/kern/proc_test.c \
 	bertos/verstag.c
 
 demo_CPPASRC = \
-	bertos/kern/switch.S
+	bertos/emul/switch.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/drv/lcd_gfx_qt.o: bertos/drv/lcd_gfx_qt_moc.cpp
-$(OBJDIR)/demo/bertos/drv/timer.o: bertos/drv/timer_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
 
 #FIXME: isn't there a way to avoid repeating the pattern rule?
-bertos/drv/timer_qt_moc.cpp: bertos/emul/timer_qt.c
+bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
 	$(QT_MOC) -o $@ $<
 
 
-demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(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
-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
-