Mercurial > hg > sonic-visualiser
diff sv.pro @ 547:8103ad8eef87
Merge from qt5 branch. Next release will require qt5
author | Chris Cannam |
---|---|
date | Thu, 09 May 2013 17:20:24 +0100 |
parents | e5e6625deb85 |
children | 2fd3c90fff29 ba338234c001 85834f881360 |
line wrap: on
line diff
--- a/sv.pro Tue Apr 16 15:21:47 2013 +0100 +++ b/sv.pro Thu May 09 17:20:24 2013 +0100 @@ -4,7 +4,7 @@ include(config.pri) CONFIG += qt thread warn_on stl rtti exceptions -QT += network xml gui +QT += network xml gui widgets TARGET = "Sonic Visualiser" linux*:TARGET = sonic-visualiser @@ -23,29 +23,35 @@ contains(DEFINES, BUILD_STATIC):LIBS -= -ljack -LIBS = -Lsvapp -Lsvgui -Lsvcore -lsvapp -lsvgui -lsvcore $$LIBS +MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay + +linux* { +MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic +} + +LIBS = $$MY_LIBS $$LIBS win* { PRE_TARGETDEPS += svapp/svapp.lib \ svgui/svgui.lib \ - svcore/svcore.lib + svcore/svcore.lib \ + dataquay/dataquay.lib } !win* { PRE_TARGETDEPS += svapp/libsvapp.a \ svgui/libsvgui.a \ - svcore/libsvcore.a + svcore/libsvcore.a \ + dataquay/libdataquay.a } RESOURCES += sonic-visualiser.qrc HEADERS += main/MainWindow.h \ - main/PreferencesDialog.h \ - main/Surveyer.h + main/PreferencesDialog.h SOURCES += main/main.cpp \ main/OSCHandler.cpp \ main/MainWindow.cpp \ - main/PreferencesDialog.cpp \ - main/Surveyer.cpp + main/PreferencesDialog.cpp # for mac integration QMAKE_INFO_PLIST = deploy/osx/Info.plist