X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=eab6c3cb5e48d3c5b4f3ec1fa29180141ec55db3;hb=00455e9ad45329213214919462b4bf1e9cde6f11;hp=7c2646835a4d6b25c2a98470e8cc26e8e7fc63fd;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 7c264683..eab6c3cb 100644
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -5,7 +5,7 @@
 #
 # Makefile fragment for DevLib demo application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 
 include bertos/fonts/fonts.mk
@@ -41,9 +41,10 @@ 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/drv/ser_posix.c \
+	bertos/emul/ser_posix.c \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \
 	bertos/mware/event.c \
@@ -51,37 +52,32 @@ demo_CSRC = \
 	bertos/mware/resource.c \
 	bertos/mware/sprintf.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/drv/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
-