projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert to new Doxygen comments.
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index f82e5b908eb6548c218e5df64dc236d90550ce96..580b6c2218570a4c60c484e0a3eb3a8c7796c2b5 100755
(executable)
--- a/
app/demo/demo.mk
+++ b/
app/demo/demo.mk
@@
-8,6
+8,15
@@
# Author: Bernardo Innocenti <bernie@develer.com>
#
# $Log$
# Author: Bernardo Innocenti <bernie@develer.com>
#
# $Log$
+# Revision 1.6 2006/06/02 12:27:36 bernie
+# Tweak apparence; enable assertions.
+#
+# Revision 1.5 2006/05/27 22:42:02 bernie
+# Add verstag.
+#
+# Revision 1.4 2006/05/27 17:16:38 bernie
+# Make demos a bit more interesting.
+#
# Revision 1.3 2006/05/15 07:21:24 bernie
# Use pkg-config.
#
# Revision 1.3 2006/05/15 07:21:24 bernie
# Use pkg-config.
#
@@
-17,7
+26,6
@@
# Revision 1.1 2006/03/22 09:52:13 bernie
# Add demo application.
#
# Revision 1.1 2006/03/22 09:52:13 bernie
# Add demo application.
#
-#
# Set to 1 for debug builds
# Set to 1 for debug builds
@@
-43,6
+51,7
@@
demo_CSRC = \
gfx/win.c \
gfx/text.c \
gfx/text_format.c \
gfx/win.c \
gfx/text.c \
gfx/text_format.c \
+ gui/menu.c \
fonts/helvB10.c \
fonts/luBS14.c \
fonts/ncenB18.c \
fonts/helvB10.c \
fonts/luBS14.c \
fonts/ncenB18.c \
@@
-56,14
+65,14
@@
demo_CSRC = \
mware/formatwr.c \
mware/hex.c \
mware/event.c \
mware/formatwr.c \
mware/hex.c \
mware/event.c \
- mware/menu.c \
mware/observer.c \
mware/resource.c \
mware/sprintf.c \
kern/proc.c \
kern/sem.c \
kern/signal.c \
mware/observer.c \
mware/resource.c \
mware/sprintf.c \
kern/proc.c \
kern/sem.c \
kern/signal.c \
- kern/monitor.c
+ kern/monitor.c \
+ verstag.c
demo_ASRC = \
kern/switch_x86_64.s
demo_ASRC = \
kern/switch_x86_64.s
@@
-74,13
+83,17
@@
$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
EMUL_CFLAGS = $(shell pkg-config QtGui --cflags) -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
EMUL_LDFLAGS = $(shell pkg-config QtGui --libs)
EMUL_CFLAGS = $(shell pkg-config QtGui --cflags) -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
EMUL_LDFLAGS = $(shell pkg-config QtGui --libs)
-demo_CFLAGS = -
Os -D_QT=4 -D'ARCH=ARCH_EMUL'
-Ihw $(EMUL_CFLAGS)
-demo_CXXFLAGS = -
Os -D_QT=4 -D'ARCH=ARCH_EMUL'
-Ihw $(EMUL_CFLAGS)
+demo_CFLAGS = -
D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo
-Ihw $(EMUL_CFLAGS)
+demo_CXXFLAGS = -
D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo
-Ihw $(EMUL_CFLAGS)
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
ifeq ($(demo_DEBUG),1)
demo_CFLAGS += -D_DEBUG
demo_LDFLAGS = $(EMUL_LDFLAGS)
# Debug stuff
ifeq ($(demo_DEBUG),1)
demo_CFLAGS += -D_DEBUG
+ demo_CXXFLAGS += -D_DEBUG
# demo_PCSRC += drv/kdebug.c
# demo_PCSRC += drv/kdebug.c
+else
+ demo_CFLAGS += -Os
+ demo_CXXFLAGS += -Os
endif
endif