X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=941e28a6b76e911a37f9463d894e635e7229e39c;hb=8cfe12e5b95974d75b98ec964fc7edaf37919f0e;hp=7bf46ae538e2339efa40c2d74c46059c5c4bde7d;hpb=22e903f490208fcc6f6de86250c723b1f200a61d;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 7bf46ae5..941e28a6 100644
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -5,15 +5,12 @@
 #
 # 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
 
@@ -44,6 +41,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 \
@@ -55,6 +53,7 @@ demo_CSRC = \
 	bertos/mware/sprintf.c \
 	bertos/kern/proc.c \
 	bertos/kern/proc_test.c \
+	bertos/kern/preempt.c \
 	bertos/kern/sem.c \
 	bertos/kern/signal.c \
 	bertos/kern/monitor.c \
@@ -74,17 +73,12 @@ 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 -Ibertos/emul $(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
-