# HG changeset patch
# User Chris Cannam
# Date 1368197448 -3600
# Node ID f2d98dcb994324ceaf91c998ed199cc3ca8109fb
# Parent  e82080cf7da89b460b4fa90cc820ccda9b451d11# Parent  a983faf611a4aa6168c5ef709806da7ec1ae599f
Merge

diff -r a983faf611a4 -r f2d98dcb9943 .hgsub
--- a/.hgsub	Fri May 10 15:50:19 2013 +0100
+++ b/.hgsub	Fri May 10 15:50:48 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 a983faf611a4 -r f2d98dcb9943 .hgsubstate
--- a/.hgsubstate	Fri May 10 15:50:19 2013 +0100
+++ b/.hgsubstate	Fri May 10 15:50:48 2013 +0100
@@ -1,4 +1,5 @@
 1618ab0f5e89bb6a0c6242bea545fe76a5fcd755 dataquay
+619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 6c66fb64db64b6e156adc331480f056f3f998464 svapp
 98cf98a217d2516fd739dee08c4dc7f02ab82709 svcore
 2146130d12366b1733151bac3a81e2a9076bfb5b svgui
diff -r a983faf611a4 -r f2d98dcb9943 main/main.cpp
--- a/main/main.cpp	Fri May 10 15:50:19 2013 +0100
+++ b/main/main.cpp	Fri May 10 15:50:48 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 a983faf611a4 -r f2d98dcb9943 platform-dataquay.pri
--- a/platform-dataquay.pri	Fri May 10 15:50:19 2013 +0100
+++ b/platform-dataquay.pri	Fri May 10 15:50:48 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 a983faf611a4 -r f2d98dcb9943 sonic-visualiser.pro
--- a/sonic-visualiser.pro	Fri May 10 15:50:19 2013 +0100
+++ b/sonic-visualiser.pro	Fri May 10 15:50:48 2013 +0100
@@ -1,5 +1,14 @@
 TEMPLATE = subdirs
-SUBDIRS = dataquay svcore svgui svapp sub_sv svcore/data/fileio/test
+SUBDIRS = dataquay_lib 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
+}
+
+dataquay_lib.file = dataquay/lib.pro
 
 sub_sv.file = sv.pro
 
diff -r a983faf611a4 -r f2d98dcb9943 sv.pro
--- a/sv.pro	Fri May 10 15:50:19 2013 +0100
+++ b/sv.pro	Fri May 10 15:50:48 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
+