From: bernie Date: Mon, 15 May 2006 07:21:24 +0000 (+0000) Subject: Use pkg-config. X-Git-Tag: 1.0.0~639 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=39d6b2d1d9df77a019b6d2c436da87e862f9d452;p=bertos.git Use pkg-config. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@602 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/app/demo/demo.mk b/app/demo/demo.mk index 1347fce9..f82e5b90 100755 --- a/app/demo/demo.mk +++ b/app/demo/demo.mk @@ -8,6 +8,9 @@ # Author: Bernardo Innocenti # # $Log$ +# 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. # @@ -69,8 +72,8 @@ 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 +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_LDFLAGS = $(EMUL_LDFLAGS)