Make demos a bit more interesting.

[bertos.git] / app / demo / demo.mk

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 1347fce901c874e88f41636628eea1f6ca9abc8d..18a881dab73e894e1fb48b389a8ca714ab95e410 100755 (executable)
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -8,6 +8,12 @@
 # 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.
 #
@@ -40,6 +46,7 @@ demo_CSRC = \
        gfx/win.c \
        gfx/text.c \
        gfx/text_format.c \
+       gui/menu.c \
        fonts/helvB10.c \
        fonts/luBS14.c \
        fonts/ncenB18.c \
@@ -53,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 \
@@ -69,10 +75,10 @@ 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)
-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 = -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