projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add whence parameter to seek; change from char * to void * read/write input buffers.
[bertos.git]
/
app
/
demo
/
demo.mk
diff --git
a/app/demo/demo.mk
b/app/demo/demo.mk
index 580b6c2218570a4c60c484e0a3eb3a8c7796c2b5..4436a05306baedc7e13bee8706b3a8a92049ac5d 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.9 2007/09/29 15:54:14 bernie
+# Make demo Qt emulator compile again.
+#
+# 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.6 2006/06/02 12:27:36 bernie
# Tweak apparence; enable assertions.
#
@@
-27,6
+36,8
@@
# Add demo application.
#
# Add demo application.
#
+include fonts/fonts.mk
+include emul/emul.mk
# Set to 1 for debug builds
demo_DEBUG = 1
# Set to 1 for debug builds
demo_DEBUG = 1
@@
-34,8
+45,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 \
@@
-55,7
+66,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 \
@@
-72,17
+82,23
@@
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
+# FIXME: maybe this junk should go in emul/emul.mk?
$(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
+ $(QT_MOC) -o $@ $<
+
-EMUL_CFLAGS = $(shell pkg-config QtGui --cflags) -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
-EMUL_LDFLAGS = $(shell pkg-config QtGui --libs)
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)
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)