projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comments. Set static prog_flush function.
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index bd76ba52ee6a311934e130822d3c955fd0b16215..82a4a8f2e000ed9220e21699710f1950fea966f2 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.8 2006/09/20 14:27:22 marco
+# Added fonts, switch.S; fixed moc
+#
+# Revision 1.7 2006/09/19 17:48:45 bernie
+# Remove artwork.c
+#
+# 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.5 2006/05/27 22:42:02 bernie
# Add verstag.
#
@@
-23,8
+32,8
@@
# 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.
#
-#
+include fonts/fonts.mk
# Set to 1 for debug builds
demo_DEBUG = 1
# Set to 1 for debug builds
demo_DEBUG = 1
@@
-32,8
+41,8
@@
demo_DEBUG = 1
# Our target application
TRG += demo
# Our target application
TRG += demo
+# FIXME: we want to use g++ for C source too
CC = g++
CC = g++
-CXX = g++
demo_CXXSRC = \
emul/emul.cpp \
demo_CXXSRC = \
emul/emul.cpp \
@@
-53,7
+62,6
@@
demo_CSRC = \
fonts/helvB10.c \
fonts/luBS14.c \
fonts/ncenB18.c \
fonts/helvB10.c \
fonts/luBS14.c \
fonts/ncenB18.c \
- icons/artwork.c \
icons/logo.c \
drv/kbd.c \
drv/timer.c \
icons/logo.c \
drv/kbd.c \
drv/timer.c \
@@
-70,24
+78,34
@@
demo_CSRC = \
kern/sem.c \
kern/signal.c \
kern/monitor.c \
kern/sem.c \
kern/signal.c \
kern/monitor.c \
+ kern/proc_test.c \
verstag.c
verstag.c
-demo_ASRC = \
- kern/switch_x86_64.s
-
+demo_CPPASRC = \
+ kern/switch.S
$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp
$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp
$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
+$(OBJDIR)/demo/drv/timer.o: drv/timer_qt_moc.cpp
+$(OBJDIR)/demo/emul/emulkbd.o: emul/emulkbd_moc.cpp
+
+#FIXME: isn't there a way to avoid repeating the pattern rule?
+drv/timer_qt_moc.cpp: drv/timer_qt.c
+ $(MOC) -o $@ $<
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' -Iapp/demo -Ihw $(EMUL_CFLAGS)
-demo_CXXFLAGS = -
Os -
D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -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