X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=4436a05306baedc7e13bee8706b3a8a92049ac5d;hb=059ef38329c43c90936cd9eb36e1ed0cd3b7caea;hp=d642082f689ae5040d05fe8ea22662d6eb11e76b;hpb=07dd14cb4e5365e499059c937dde50ae82f473e0;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
old mode 100755
new mode 100644
index d642082f..4436a053
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -8,6 +8,12 @@
 # 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
 #
@@ -30,6 +36,8 @@
 # Add demo application.
 #
 
+include fonts/fonts.mk
+include emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -74,17 +82,23 @@ demo_CSRC = \
 	kern/sem.c \
 	kern/signal.c \
 	kern/monitor.c \
+	kern/proc_test.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/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)