X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=afa42c1dd75c0b041d1a33147a6a08a2c108f1ed;hb=3fc75747c81395f9027b6b27cd03037e2a8eec08;hp=82a4a8f2e000ed9220e21699710f1950fea966f2;hpb=9f3ea832d90fbe802a22dbfda681a1a0870a47bb;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
old mode 100755
new mode 100644
index 82a4a8f2..afa42c1d
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $
 # Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
@@ -8,6 +8,9 @@
 # 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
 #
@@ -34,6 +37,7 @@
 #
 
 include fonts/fonts.mk
+include emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -84,6 +88,7 @@ demo_CSRC = \
 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
@@ -91,10 +96,9 @@ $(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 $@ $<
+	$(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)