Rename myself

[bertos.git] / app / demo / demo.mk

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 6b78790d110d997f70aad3c21dc64fac6a3ef74b..b69a9a62f7cd1dcc3ef45d32e919d7836532737b 100644 (file)
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -5,12 +5,15 @@
 #
 # Makefile fragment for DevLib demo application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 
 include bertos/fonts/fonts.mk
 include bertos/emul/emul.mk
 
+#Demo application is hosted
+demo_EMBEDDED_TGT = 0
+
 # Set to 1 for debug builds
 demo_DEBUG = 1
 
@@ -51,27 +54,27 @@ 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/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_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ibertos/emul $(EMUL_CFLAGS)
 demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
 demo_LDFLAGS = $(EMUL_LDFLAGS)