changeset 642:e3a4831f9c64 imaf_enc

Merge from the default branch

--- a/deploy/win32/build.cmd	Mon Nov 04 17:47:53 2013 +0000
+++ b/deploy/win32/build.cmd	Tue Nov 05 11:17:35 2013 +0000
@@ -1,5 +1,8 @@
 @ECHO OFF
 SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.7\bin"
+IF NOT EXIST %WIXPATH% (
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.7\bin"
+)
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
 %WIXPATH%\light.exe -b ..\.. -ext WixUIExtension -v sonic-visualiser.wixobj

--- a/main/main.cpp	Mon Nov 04 17:47:53 2013 +0000
+++ b/main/main.cpp	Tue Nov 05 11:17:35 2013 +0000
@@ -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	Mon Nov 04 17:47:53 2013 +0000
+++ b/platform-dataquay.pri	Tue Nov 05 11:17:35 2013 +0000
@@ -1,5 +1,7 @@
 
-include(./config.pri)
+exists(config.pri) {
+    include(./config.pri)
+}
 
 CONFIG += staticlib
 
@@ -9,3 +11,9 @@
 
 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	Mon Nov 04 17:47:53 2013 +0000
+++ b/sonic-visualiser.pro	Tue Nov 05 11:17:35 2013 +0000
@@ -1,5 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore svgui svapp sub_sv #svcore/data/fileio/test
+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
+    svcore/data/fileio/test
+}
 
 sub_sv.file = sv.pro
 

--- a/sv.pro	Mon Nov 04 17:47:53 2013 +0000
+++ b/sv.pro	Tue Nov 05 11:17:35 2013 +0000
@@ -1,7 +1,25 @@
 
 TEMPLATE = app
 
-include(config.pri)
+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
@@ -29,6 +47,10 @@
 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* {
@@ -38,10 +60,10 @@
                   dataquay/dataquay.lib
 }
 !win* {
-PRE_TARGETDEPS += svapp/libsvapp.a \
-                  svgui/libsvgui.a \
-                  svcore/libsvcore.a \
-                  dataquay/libdataquay.a
+#PRE_TARGETDEPS += svapp/libsvapp.a \
+#                  svgui/libsvgui.a \
+#                  svcore/libsvcore.a \
+#                  dataquay/libdataquay.a
 }
 
 RESOURCES += sonic-visualiser.qrc