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

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
old mode 100755
new mode 100644
index f82e5b90..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,24 @@
 # 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.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.
 #
@@ -17,8 +35,9 @@
 # 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
@@ -26,8 +45,8 @@ demo_DEBUG = 1
 # Our target application
 TRG += demo
 
+# FIXME: we want to use g++ for C source too
 CC = g++
-CXX = g++
 
 demo_CXXSRC = \
 	emul/emul.cpp \
@@ -43,10 +62,10 @@ demo_CSRC = \
 	gfx/win.c \
 	gfx/text.c \
 	gfx/text_format.c \
+	gui/menu.c \
 	fonts/helvB10.c \
 	fonts/luBS14.c \
 	fonts/ncenB18.c \
-	icons/artwork.c \
 	icons/logo.c \
 	drv/kbd.c \
 	drv/timer.c \
@@ -56,31 +75,41 @@ demo_CSRC = \
 	mware/formatwr.c \
 	mware/hex.c \
 	mware/event.c \
-	mware/menu.c \
 	mware/observer.c \
 	mware/resource.c \
 	mware/sprintf.c \
 	kern/proc.c \
 	kern/sem.c \
 	kern/signal.c \
-	kern/monitor.c
-
-demo_ASRC = \
-	kern/switch_x86_64.s
+	kern/monitor.c \
+	kern/proc_test.c \
+	verstag.c
 
+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 = -Os -D_QT=4 -D'ARCH=ARCH_EMUL' -Ihw $(EMUL_CFLAGS)
-demo_CXXFLAGS = -Os -D_QT=4 -D'ARCH=ARCH_EMUL' -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_CXXFLAGS += -D_DEBUG
 #	demo_PCSRC += drv/kdebug.c
+else
+	demo_CFLAGS += -Os
+	demo_CXXFLAGS += -Os
 endif