Initial (nonworking) draft of preemptive task switching

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

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 884755165f5983aa056f6c5b173460abd501b7db..941e28a6b76e911a37f9463d894e635e7229e39c 100644 (file)
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -41,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 \
@@ -52,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 \
@@ -71,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
-