X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.mk;h=18a881dab73e894e1fb48b389a8ca714ab95e410;hb=37855ea2d53f06d9ef1e93911929c455c920c5bb;hp=14d5ca2da6c79800bb5d8f54e95d1a9320859919;hpb=c49c99e64ee64ad490b2aea2d6c6d8f9f6d225db;p=bertos.git

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 14d5ca2d..18a881da 100755
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -8,6 +8,15 @@
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
 # $Log$
+# 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.
 #
@@ -37,10 +46,12 @@ 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 \
 	drv/buzzer.c \
@@ -49,7 +60,6 @@ demo_CSRC = \
 	mware/formatwr.c \
 	mware/hex.c \
 	mware/event.c \
-	mware/menu.c \
 	mware/observer.c \
 	mware/resource.c \
 	mware/sprintf.c \
@@ -65,14 +75,15 @@ demo_ASRC = \
 $(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp 
 $(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp
 
-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)
+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' -Iapp/demo -Ihw $(EMUL_CFLAGS)
+demo_CXXFLAGS = -Os -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
+ifeq ($(demo_DEBUG),1)
+	demo_CFLAGS += -D_DEBUG
 #	demo_PCSRC += drv/kdebug.c
-#endif
+endif