changeset 1303:409ee88107e8 project-file-rework

Numerous Windows fixes in subrepos
author Chris Cannam
date Fri, 28 Oct 2016 14:32:45 +0100 (2016-10-28)
parents d0a7a508ff2e
children 6e47bd2263e2
files .hgsubstate server.pro
diffstat 2 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Oct 28 11:32:36 2016 +0100
+++ b/.hgsubstate	Fri Oct 28 14:32:45 2016 +0100
@@ -1,12 +1,12 @@
 fd86e70e00ae923479609a7e53d6481c09a76791 bqaudioio
 6b0cbfca8fb7cf64f89b0a0026b63bc212b156af bqresample
 68f8e88d6d76fc4ca074166cb80979ccbfc2b6c9 bqvec
-45ad9f91f97768f0559baeea78305d78e347bbd9 checker
+78baaad4a001aa74a9e01473defbc6c31092e3fc checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
-c7164afe438ca500579cc51a0269adb4bab5f33d piper-cpp
+bcfadce0b8acf66565fadfe50f3aaffbeb6e5c1c piper-cpp
 e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
 d5e339613174be7acfe20906a347b35c396883b4 svapp
 a83541a1f1003244e058a86a7ba0cde8bc7ed409 svcore
 8e4b90aeefaa58a1744f0291768ce03e1652f3a1 svgui
-59f7c7ae2f6437d039e328ef61d91dcf0f538680 vamp-plugin-sdk
+79a219ba617862adffd78925f1571e5c96760e0a vamp-plugin-sdk
--- a/server.pro	Fri Oct 28 11:32:36 2016 +0100
+++ b/server.pro	Fri Oct 28 14:32:45 2016 +0100
@@ -13,13 +13,6 @@
     include(noconfig.pri)
 
     macx*: LIBS -= -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate -lbz2 -lz
-
-    LIBS -= -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -lpthread
-
-    win32-g++: {
-        QMAKE_CXXFLAGS += -static-libgcc -static-libstdc++
-        QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-    }
 }
 
 # Can't support this flag with the JSON11 and basen modules as they stand