Build Config Fixups

We ask for phonon in src.pro, but it is NOT required, this
is because the video playback was rewritten to use the vlc
libraries.

Additionally, the build.pro now asks for ordered builds to
ensure the qwt libs are built before src is started. This is
useful when performing builds with multipe jobs (make -j n).
This commit is contained in:
Mark Liversedge
2011-10-12 09:46:40 +01:00
parent 12dfc5ccc5
commit 4510404145
2 changed files with 2 additions and 1 deletions

View File

@@ -1,2 +1,3 @@
TEMPLATE = subdirs
SUBDIRS = qwt src
CONFIG += ordered

View File

@@ -8,7 +8,7 @@ DEPENDPATH += .
!isEmpty( BOOST_INCLUDE ) { INCLUDEPATH += $${BOOST_INCLUDE} }
INCLUDEPATH += ../qwt/src ../qxt/src
QT += xml sql network webkit phonon
QT += xml sql network webkit
LIBS += ../qwt/lib/libqwt.a
LIBS += -lm