projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preempt: Implement scheduling priorities
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index a836d007f682d4663565286c92e66509a57481ba..920f2a6a7074ea97dfdab7777a8968010e31f2e0 100644
(file)
--- a/
app/demo/demo.mk
+++ b/
app/demo/demo.mk
@@
-1,10
+1,10
@@
#
#
-# $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
# Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
# 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.
#
#
# Makefile fragment for DevLib demo application.
#
+# Version: $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
# Author: Bernie Innocenti <bernie@codewiz.org>
#
# Author: Bernie Innocenti <bernie@codewiz.org>
#
@@
-18,7
+18,8
@@
demo_DEBUG = 1
TRG += demo
# FIXME: we want to use g++ for C source too
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 \
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/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 \
bertos/drv/buzzer.c \
bertos/drv/ser.c \
bertos/emul/ser_posix.c \
@@
-50,6
+52,9
@@
demo_CSRC = \
bertos/mware/observer.c \
bertos/mware/resource.c \
bertos/mware/sprintf.c \
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/proc.c \
bertos/kern/proc_test.c \
bertos/kern/sem.c \
@@
-71,8
+76,8
@@
bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
$(QT_MOC) -o $@ $<
$(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
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
@@
-80,4
+85,3
@@
ifeq ($(demo_DEBUG),0)
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
-