diff sv.pro @ 1268:ba71dbc5ee8b piper

Merge from branch 3.0-integration

--- a/sv.pro	Mon Oct 17 18:56:28 2016 +0100
+++ b/sv.pro	Thu Oct 20 11:19:34 2016 +0100
@@ -8,8 +8,19 @@
     LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib
 }
 win32-msvc* {
-    INCLUDEPATH += sv-dependency-builds/win32-msvc/include
-    LIBS += -Lrelease -Lsv-dependency-builds/win32-msvc/lib
+    # 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
+# 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
@@ -23,16 +34,22 @@
 !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
 
     LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo
 
     win* {
-        DEFINES += _USE_MATH_DEFINES
+        DEFINES += NOMINMAX _USE_MATH_DEFINES
+        DEFINES -= HAVE_LIBLO
         LIBS += -lwinmm -lws2_32
     }
+    win32-msvc* {
+        LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -lsord-0 -lserd-0 -llo
+        LIBS += -lsord -lserd -ladvapi32
+    }
     macx* {
         DEFINES += HAVE_COREAUDIO
         LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
@@ -68,13 +85,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 \
@@ -89,6 +110,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 += \