X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=d8d1dbcf2c5d8af2176fe5204ada2b5bac1e4bc4;hb=0d1eaaacb138c1f339d0aa7c97163cf52924887f;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..d8d1dbcf
--- 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.
 #
@@ -7,33 +7,9 @@
 #
 # 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.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.2  2006/03/27 04:49:50  bernie
-# Add bouncing logo demo.
-#
-# Revision 1.1  2006/03/22 09:52:13  bernie
-# Add demo application.
-#
 
 include fonts/fonts.mk
+include emul/emul.mk
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -84,6 +60,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 +68,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)
@@ -103,7 +79,7 @@ demo_LDFLAGS = $(EMUL_LDFLAGS)
 ifeq ($(demo_DEBUG),1)
 	demo_CFLAGS += -D_DEBUG
 	demo_CXXFLAGS += -D_DEBUG
-#	demo_PCSRC += drv/kdebug.c
+	demo_CSRC += drv/kdebug.c
 else
 	demo_CFLAGS += -Os
 	demo_CXXFLAGS += -Os