Mercurial > hg > sonic-visualiser
changeset 1299:9027d12841af project-file-rework
Win32 fixes in subrepos (inc binary modes for server)
| author | Chris Cannam |
|---|---|
| date | Thu, 27 Oct 2016 16:14:49 +0100 |
| parents | c0f55499d8b1 |
| children | f7481cb5a1ff |
| files | .hgsubstate noconfig.pri server.pro |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Thu Oct 27 14:01:35 2016 +0100 +++ b/.hgsubstate Thu Oct 27 16:14:49 2016 +0100 @@ -4,9 +4,9 @@ 8643d4d1cb14226c72be27e7493597b9a2af526d checker 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable -b9331a5161748433613d5f30035666a3e33af12e piper-cpp +fa98f112bfbb3701c00cd34e928b56a234ee926c piper-cpp e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds d5e339613174be7acfe20906a347b35c396883b4 svapp -2d9e2771805a28864390d75e03a1a214348b08a6 svcore +7f4230e7d83a911dd0e92c34ced6443509e642b0 svcore 8e4b90aeefaa58a1744f0291768ce03e1652f3a1 svgui 59f7c7ae2f6437d039e328ef61d91dcf0f538680 vamp-plugin-sdk
--- a/noconfig.pri Thu Oct 27 14:01:35 2016 +0100 +++ b/noconfig.pri Thu Oct 27 16:14:49 2016 +0100 @@ -1,5 +1,9 @@ CONFIG += release + +#CONFIG -= release +#CONFIG += debug + DEFINES += NDEBUG BUILD_RELEASE DEFINES += NO_TIMING
--- a/server.pro Thu Oct 27 14:01:35 2016 +0100 +++ b/server.pro Thu Oct 27 16:14:49 2016 +0100 @@ -13,6 +13,13 @@ 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++ + } } # Using the "console" CONFIG flag above should ensure this happens for