Mercurial > hg > tony

diff tonyapp.pro @ 507:fc726260b29b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "2.0-integration"
author Chris Cannam
date Mon, 19 Oct 2015 11:38:17 +0100
parents 7665cc683dd1
children fcc7e62bfac7
line wrap: on
line diff
--- a/tonyapp.pro	Fri Aug 14 18:16:14 2015 +0100
+++ b/tonyapp.pro	Mon Oct 19 11:38:17 2015 +0100
@@ -38,21 +38,22 @@
 }
 
 CONFIG += qt thread warn_on stl rtti exceptions c++11
-QT += network xml gui widgets
+QT += network xml gui widgets svg
 
 TARGET = Tony
 linux*:TARGET = tony
 solaris*:TARGET = tony
 
-DEPENDPATH += . svcore svgui svapp
-INCLUDEPATH += . svcore svgui svapp
+DEPENDPATH += . bqaudioio svcore svgui svapp
+INCLUDEPATH += . bqaudioio svcore svgui svapp
 
 OBJECTS_DIR = o
 MOC_DIR = o
 
 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
 
-MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay
+MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -L. \
+          -lsvapp -lsvgui -lsvcore -ldataquay -lbq
 
 linux* {
 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic