changeset 539:bf1c6e2b8791 with-dependencies

Windows build fixes -- to review

--- a/.hgsubstate	Wed Mar 27 16:56:39 2013 +0000
+++ b/.hgsubstate	Wed Mar 27 17:23:05 2013 +0000
@@ -1,5 +1,5 @@
 345a563df58bc7f7069727e95a267843b29c41b8 dataquay
-59685d5285b1663ca95c7df9e55aa0e43aa80b3f sv-dependency-builds
+b07fe9e906dcf251271672b2bd5eb7b19c77ca33 sv-dependency-builds
 3ee1bd4b0995d4ddd3532e9a817303ed71333919 svapp
-f9f5e18a366ec57c5889e63824473e3f36b11b39 svcore
-0b9960f0f0bc8b9f5b417cba51fca9c8a9cb5cc1 svgui
+711a4652d616dfe0ec1845d5fac6f53ef9c4efa1 svcore
+e11a9d91b86b9695203de0da52f2563d35dcb929 svgui

--- a/main/main.cpp	Wed Mar 27 16:56:39 2013 +0000
+++ b/main/main.cpp	Wed Mar 27 17:23:05 2013 +0000
@@ -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;

--- a/sonic-visualiser.pro	Wed Mar 27 16:56:39 2013 +0000
+++ b/sonic-visualiser.pro	Wed Mar 27 17:23:05 2013 +0000
@@ -1,5 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS = dataquay_lib 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
 

--- a/sv.pro	Wed Mar 27 16:56:39 2013 +0000
+++ b/sv.pro	Wed Mar 27 17:23:05 2013 +0000
@@ -1,12 +1,22 @@
 
 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
     }
 }
 
@@ -20,15 +30,6 @@
 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
@@ -46,7 +47,7 @@
 }
 
 win* {
-MY_LIBS = -Lsvapp/debug -Lsvgui/debug -Lsvcore/debug -Ldataquay/debug $$MY_LIBS
+MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$MY_LIBS
 }
 
 LIBS = $$MY_LIBS $$LIBS