diff sv.pro @ 642:e3a4831f9c64 imaf_enc

Merge from the default branch

--- 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