Mercurial > hg > sonic-visualiser
changeset 535:2fd3c90fff29 with-dependencies
Add dependency paths
author | Chris Cannam <chris.cannam@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Mar 2013 15:20:27 +0000 (2013-03-25) |
parents | 8d0d4ae4b592 |
children | 2fe2fd554522 |
files | .hgsubstate sv.pro |
diffstat | 2 files changed, 75 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Mar 25 15:16:47 2013 +0000 +++ b/.hgsubstate Mon Mar 25 15:20:27 2013 +0000 @@ -1,5 +1,5 @@ 345a563df58bc7f7069727e95a267843b29c41b8 dataquay -48209aa7aa514e6d8681607b98685d31f4285b57 sv-dependency-builds -3c236d31cccd3eb2d932b2a02d0143b2a52597d5 svapp -95d4a59295b7086b6cb8fc2d71586283024dc686 svcore -d632a1e87018c266830b399016adb2601876d5f0 svgui +59685d5285b1663ca95c7df9e55aa0e43aa80b3f sv-dependency-builds +518b2cbd6bf2d8d815934b6559cc439ce578c6a0 svapp +d97b4c23dd75c8ede68398896e09a37df87ba3f3 svcore +0b9960f0f0bc8b9f5b417cba51fca9c8a9cb5cc1 svgui
--- a/sv.pro Mon Mar 25 15:16:47 2013 +0000 +++ b/sv.pro Mon Mar 25 15:20:27 2013 +0000 @@ -1,58 +1,71 @@ - -TEMPLATE = app - -include(config.pri) - -CONFIG += qt thread warn_on stl rtti exceptions -QT += network xml gui widgets - -TARGET = "Sonic Visualiser" -linux*:TARGET = sonic-visualiser -solaris*:TARGET = sonic-visualiser - -DEPENDPATH += . svcore svgui svapp -INCLUDEPATH += . svcore svgui svapp - -TRANSLATIONS += i18n/sonic-visualiser_ru.ts i18n/sonic-visualiser_en_GB.ts i18n/sonic-visualiser_en_US.ts i18n/sonic-visualiser_cs_CZ.ts - -OBJECTS_DIR = o -MOC_DIR = o - -ICON = icons/sv-macicon.icns -RC_FILE = icons/sv.rc - -contains(DEFINES, BUILD_STATIC):LIBS -= -ljack - -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 \ - dataquay/dataquay.lib -} -!win* { -PRE_TARGETDEPS += svapp/libsvapp.a \ - svgui/libsvgui.a \ - svcore/libsvcore.a \ - dataquay/libdataquay.a -} - -RESOURCES += sonic-visualiser.qrc - -HEADERS += main/MainWindow.h \ - main/PreferencesDialog.h -SOURCES += main/main.cpp \ - main/OSCHandler.cpp \ - main/MainWindow.cpp \ - main/PreferencesDialog.cpp - -# for mac integration -QMAKE_INFO_PLIST = deploy/osx/Info.plist - + +TEMPLATE = app + +include(config.pri) + +CONFIG += qt thread warn_on stl rtti exceptions +QT += network xml gui widgets + +TARGET = "Sonic Visualiser" +linux*:TARGET = sonic-visualiser +solaris*:TARGET = sonic-visualiser + +DEPENDPATH += . svcore svgui svapp +INCLUDEPATH += . svcore svgui svapp + +win32-g++ { + INCLUDEPATH += sv-dependency-builds/win32-mingw/include + LIBS += sv-dependency-builds/win32-mingw/lib +} +win32-msvc* { + INCLUDEPATH += sv-dependency-builds/win32-msvc/include + LIBS += sv-dependency-builds/win32-msvc/lib +} + +TRANSLATIONS += i18n/sonic-visualiser_ru.ts i18n/sonic-visualiser_en_GB.ts i18n/sonic-visualiser_en_US.ts i18n/sonic-visualiser_cs_CZ.ts + +OBJECTS_DIR = o +MOC_DIR = o + +ICON = icons/sv-macicon.icns +RC_FILE = icons/sv.rc + +contains(DEFINES, BUILD_STATIC):LIBS -= -ljack + +MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay + +linux* { +MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic +} + +win* { +MY_LIBS = -Lsvapp/debug -Lsvgui/debug -Lsvcore/debug -Ldataquay/debug $$MY_LIBS +} + +LIBS = $$MY_LIBS $$LIBS + +win* { +#PRE_TARGETDEPS += svapp/svapp.lib \ +# svgui/svgui.lib \ +# svcore/svcore.lib \ +# dataquay/dataquay.lib +} +!win* { +PRE_TARGETDEPS += svapp/libsvapp.a \ + svgui/libsvgui.a \ + svcore/libsvcore.a \ + dataquay/libdataquay.a +} + +RESOURCES += sonic-visualiser.qrc + +HEADERS += main/MainWindow.h \ + main/PreferencesDialog.h +SOURCES += main/main.cpp \ + main/OSCHandler.cpp \ + main/MainWindow.cpp \ + main/PreferencesDialog.cpp + +# for mac integration +QMAKE_INFO_PLIST = deploy/osx/Info.plist +