projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new name.
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index 7bf46ae538e2339efa40c2d74c46059c5c4bde7d..3b318d20d3a60d463a200d6f06bb16926accb4fb 100644
(file)
--- a/
app/demo/demo.mk
+++ b/
app/demo/demo.mk
@@
-1,19
+1,16
@@
#
#
-# $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.
#
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Version: $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
+# Author: Bernie Innocenti <bernie@codewiz.org>
#
include bertos/fonts/fonts.mk
include bertos/emul/emul.mk
#
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
# Set to 1 for debug builds
demo_DEBUG = 1
@@
-22,6
+19,7
@@
TRG += demo
# FIXME: we want to use g++ for C source too
CC = g++
# FIXME: we want to use g++ for C source too
CC = g++
+CXX = g++
demo_CXXSRC = \
bertos/emul/emul.cpp \
demo_CXXSRC = \
bertos/emul/emul.cpp \
@@
-44,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 \
@@
-53,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 \
@@
-74,17
+76,12
@@
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
-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
demo_CFLAGS += -Os
demo_CXXFLAGS += -Os
endif
-