changeset 1266:3ca6b4102407 msvc2015_64

Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.

--- a/.hgsubstate	Wed Oct 19 09:11:51 2016 +0100
+++ b/.hgsubstate	Wed Oct 19 17:33:32 2016 +0100
@@ -4,8 +4,8 @@
 92e72014d9798a7339cfb09d6f2d877d8bf7fd65 checker
 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
-d530e058a1c16a5707141f2de305e6891874759e sv-dependency-builds
-85c83499be3c01398d4ea0deda5d991795c3a722 svapp
-794b64e62e58ba812ad50e9d6e34575244de124c svcore
+efe5b9f38b13a28cb8054da2490fa32caf4364b2 sv-dependency-builds
+3ab6a5f7aca8330e0c16d74266facb615614f67d svapp
+a68d407f9752a59df67e57d25cca79c538ca9950 svcore
 52675a1f662c62f94596146e4ed5b237fe562f09 svgui
 9a2998401bbe0a7b9e3233eeca5004542bc0014d vamp-plugin-sdk

--- a/sv.pro	Wed Oct 19 09:11:51 2016 +0100
+++ b/sv.pro	Wed Oct 19 17:33:32 2016 +0100
@@ -11,7 +11,16 @@
     # We actually expect MSVC to be used only for 64-bit builds,
     # though the qmake spec is still called win32-msvc*
     INCLUDEPATH += sv-dependency-builds/win64-msvc/include
-    LIBS += -Lrelease -Lsv-dependency-builds/win64-msvc/lib
+# bah, this is happening even if not debug build
+#    CONFIG(debug) {
+#        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
+#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
+#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
+#    }
+    CONFIG(release) {
+        LIBS += -Lrelease \
+            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
+    }
 }
 mac* {
     INCLUDEPATH += sv-dependency-builds/osx/include
@@ -25,7 +34,8 @@
 !exists(config.pri) {
 
     CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
+    DEFINES += NDEBUG BUILD_RELEASE
+    DEFINES += NO_TIMING
 
     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
 
@@ -73,13 +83,17 @@
 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
 }
 
-win* {
+##??? how to set this appropriately for debug/release
+win32*:CONFIG(debug) {
+MY_LIBS = -Lsvapp/debug -Lsvgui/debug -Lsvcore/debug -Lchecker/debug -Ldataquay/debug $$MY_LIBS
+}
+win32*:CONFIG(release) {
 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release $$MY_LIBS
 }
 
 LIBS = $$MY_LIBS $$LIBS
 
-win* {
+win32-g++* {
 PRE_TARGETDEPS += svapp/release/libsvapp.a \
                   svgui/release/libsvgui.a \
                   svcore/release/libsvcore.a \
@@ -94,6 +108,21 @@
                   checker/libchecker.a
 }
 
+win32-msvc*:CONFIG(debug) {
+PRE_TARGETDEPS += svapp/debug/svapp.lib \
+                  svgui/debug/svgui.lib \
+                  svcore/debug/svcore.lib \
+                  dataquay/debug/dataquay.lib \
+                  checker/debug/checker.lib
+}
+win32-msvc*:CONFIG(release) {
+PRE_TARGETDEPS += svapp/release/svapp.lib \
+                  svgui/release/svgui.lib \
+                  svcore/release/svcore.lib \
+                  dataquay/release/dataquay.lib \
+                  checker/release/checker.lib
+}
+
 RESOURCES += sonic-visualiser.qrc
 
 HEADERS += \