# HG changeset patch
# User Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
# Date 1368539250 -3600
# Node ID 96a0e169b70f634809a86ef0e01e356b27263bb3
# Parent  881a3f0dd268c654686b8667a7da141ea0ecfec6# Parent  0757db4b5d103a950512d218374060ab392930b0
Merge from default branch

diff -r 0757db4b5d10 -r 96a0e169b70f .hgsub
--- a/.hgsub	Tue May 14 14:41:37 2013 +0100
+++ b/.hgsub	Tue May 14 14:47:30 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
diff -r 0757db4b5d10 -r 96a0e169b70f .hgsubstate
--- a/.hgsubstate	Tue May 14 14:41:37 2013 +0100
+++ b/.hgsubstate	Tue May 14 14:47:30 2013 +0100
@@ -1,4 +1,5 @@
 7096c7de2d4c327de5e028c33036f146a1884706 dataquay
+619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 32d8084f8543e6fd47f2516ab339eaac834a7b8b svapp
 67003fb58ba4d69022a4af9339e54bb60158683a svcore
 c6d705bf1672f2cd7f3d4cfe46aa3db6062c004c svgui
diff -r 0757db4b5d10 -r 96a0e169b70f main/main.cpp
--- a/main/main.cpp	Tue May 14 14:41:37 2013 +0100
+++ b/main/main.cpp	Tue May 14 14:47:30 2013 +0100
@@ -253,8 +253,8 @@
     signal(SIGTERM, signalHandler);
 
 #ifndef Q_WS_WIN32
-    signal(SIGHUP,  signalHandler);
-    signal(SIGQUIT, signalHandler);
+//???    signal(SIGHUP,  signalHandler);
+//???    signal(SIGQUIT, signalHandler);
 #endif
 
     bool audioOutput = true;
diff -r 0757db4b5d10 -r 96a0e169b70f platform-dataquay.pri
--- a/platform-dataquay.pri	Tue May 14 14:41:37 2013 +0100
+++ b/platform-dataquay.pri	Tue May 14 14:47:30 2013 +0100
@@ -1,13 +1,21 @@
-
-include(./config.pri)
-
-CONFIG += staticlib
-
-DEFINES -= USE_REDLAND
-QMAKE_CXXFLAGS -= -I/usr/include/rasqal -I/usr/include/raptor2
-EXTRALIBS -= -lrdf
-
-DEFINES += USE_SORD
-QMAKE_CXXFLAGS += -I/usr/local/include/sord-0 -I/usr/local/include/serd-0
-EXTRALIBS += -lsord-0 -lserd-0
-
+
+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
+!win*: {
+    QMAKE_CXXFLAGS += -I/usr/local/include/sord-0 -I/usr/local/include/serd-0
+}
+EXTRALIBS += -lsord-0 -lserd-0
+
+win32-g++: {
+    INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
+    LIBS += -L../../sv-dependency-builds/win32-mingw/lib
+}
diff -r 0757db4b5d10 -r 96a0e169b70f sonic-visualiser.pro
--- a/sonic-visualiser.pro	Tue May 14 14:41:37 2013 +0100
+++ b/sonic-visualiser.pro	Tue May 14 14:47:30 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
diff -r 0757db4b5d10 -r 96a0e169b70f sv.pro
--- a/sv.pro	Tue May 14 14:41:37 2013 +0100
+++ b/sv.pro	Tue May 14 14:47:30 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
+