X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=82a4a8f2e000ed9220e21699710f1950fea966f2;hb=166a481f3faddfa24e3f0e9149a56d8d1e2baefd;hp=1347fce901c874e88f41636628eea1f6ca9abc8d;hpb=4d6d308ca900a435e80acf51b71e3ea7eccd8d5c;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 1347fce9..82a4a8f2 100755
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -8,14 +8,32 @@
 # 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
 
 # Set to 1 for debug builds
 demo_DEBUG = 1
@@ -23,8 +41,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 \
@@ -40,10 +58,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 \
@@ -53,31 +71,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
 
 $(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
+	$(MOC) -o $@ $<
 
-EMUL_CFLAGS = -I/usr/local/kde4/include/Qt -I/usr/local/kde4/include -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
-EMUL_LDFLAGS = -L /usr/local/kde4/lib64 -lQtGui -lQtCore
-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)
+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)
 
 # 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