Mercurial > hg > sonic-visualiser

changeset 605:fa99b4775d35 with-dependencies

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Fri, 26 Jul 2013 12:05:05 +0100
parents f3842da4d510 (diff) ac16e5093032 (current diff)
children b8f750319cd9
files .hgsubstate main/main.cpp
diffstat 6 files changed, 117 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Fri Jul 26 12:04:32 2013 +0100
+++ b/.hgsub	Fri Jul 26 12:05:05 2013 +0100
@@ -2,3 +2,4 @@
 svgui = https://code.soundsoftware.ac.uk/hg/svgui
 svapp = https://code.soundsoftware.ac.uk/hg/svapp
 dataquay = https://bitbucket.org/breakfastquay/dataquay
+sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds
--- a/.hgsubstate	Fri Jul 26 12:04:32 2013 +0100
+++ b/.hgsubstate	Fri Jul 26 12:05:05 2013 +0100
@@ -1,4 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
+619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp
 a1bb2989013dc380e3baf6b6e9704520f62b3bc0 svcore
 0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui
--- a/main/main.cpp	Fri Jul 26 12:04:32 2013 +0100
+++ b/main/main.cpp	Fri Jul 26 12:05:05 2013 +0100
@@ -257,7 +257,7 @@
     signal(SIGINT,  signalHandler);
     signal(SIGTERM, signalHandler);
 
-#ifndef Q_WS_WIN32
+#ifndef Q_OS_WIN32
     signal(SIGHUP,  signalHandler);
     signal(SIGQUIT, signalHandler);
 #endif
--- a/platform-dataquay.pri	Fri Jul 26 12:04:32 2013 +0100
+++ b/platform-dataquay.pri	Fri Jul 26 12:05:05 2013 +0100
@@ -1,11 +1,18 @@
-
-include(./config.pri)
-
-CONFIG += staticlib
-
-DEFINES -= USE_REDLAND
-QMAKE_CXXFLAGS -= -I/usr/include/rasqal -I/usr/include/raptor2
-EXTRALIBS -= -lrdf
-
-DEFINES += USE_SORD
-# Libraries and paths should be added by config.pri
+
+exists(config.pri) {
+    include(./config.pri)
+}
+
+CONFIG += staticlib
+
+DEFINES -= USE_REDLAND
+QMAKE_CXXFLAGS -= -I/usr/include/rasqal -I/usr/include/raptor2
+EXTRALIBS -= -lrdf
+
+DEFINES += USE_SORD
+# Libraries and paths should be added by config.pri
+
+win32-g++: {
+    INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
+    LIBS += -L../../sv-dependency-builds/win32-mingw/lib
+}
--- a/sonic-visualiser.pro	Fri Jul 26 12:04:32 2013 +0100
+++ b/sonic-visualiser.pro	Fri Jul 26 12:05:05 2013 +0100
@@ -1,10 +1,17 @@
-TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore svgui svapp sub_sv #svcore/data/fileio/test
-
-sub_sv.file = sv.pro
-
-sub_dataquay.file = dataquay/lib.pro
-
-svgui.depends = svcore
-svapp.depends = svcore svgui
-sub_sv.depends = svcore svgui svapp
+TEMPLATE = subdirs
+SUBDIRS = sub_dataquay svcore svgui svapp sub_sv
+
+!win* {
+    # We should build and run the tests on any platform,
+    # but doing it automatically doesn't work so well from
+    # within an IDE on Windows, so remove that from here
+    SUBDIRS += svcore/data/fileio/test
+}
+
+sub_sv.file = sv.pro
+
+sub_dataquay.file = dataquay/lib.pro
+
+svgui.depends = svcore
+svapp.depends = svcore svgui
+sub_sv.depends = svcore svgui svapp
--- a/sv.pro	Fri Jul 26 12:04:32 2013 +0100
+++ b/sv.pro	Fri Jul 26 12:05:05 2013 +0100
@@ -1,58 +1,79 @@
-
-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
+
+win32-g++ {
+    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
+    LIBS += -Lsv-dependency-builds/win32-mingw/lib
+}
+win32-msvc* {
+    INCLUDEPATH += sv-dependency-builds/win32-msvc/include
+    LIBS += -Lsv-dependency-builds/win32-msvc/lib
+}
+
+exists(config.pri) {
+    include(config.pri)
+}
+win* {
+    !exists(config.pri) {
+        DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
+        LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32
+    }
+}
+
+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
+}
+
+win* {
+MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$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
+