# HG changeset patch # User Chris Cannam # Date 1548419352 0 # Node ID 1a9541992121fd7cde42a7061fd7643cc1fa3ea5 # Parent 813bc429586036682e0150808afc0b3b03097ce6 Opus support on Windows (64-bit so far) diff -r 813bc4295860 -r 1a9541992121 noconfig.pri --- a/noconfig.pri Wed Jan 23 14:45:46 2019 +0000 +++ b/noconfig.pri Fri Jan 25 12:29:12 2019 +0000 @@ -65,10 +65,6 @@ DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION -#!!! to add - DEFINES -= HAVE_OPUS - LIBS -= -lopusfile - QMAKE_CXXFLAGS_RELEASE += -ffast-math # Don't have liblo @@ -85,7 +81,7 @@ # we want to do 32-bit builds with MSVC as well, then we'll # need to add a way to distinguish the two. - INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include + INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus # This seems to be intruding even when we're supposed to be release # CONFIG(debug) { @@ -100,15 +96,10 @@ DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION -#!!! to add - DEFINES -= HAVE_OPUS - LIBS -= -lopusfile - QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl QMAKE_LFLAGS_RELEASE += -ltcg - # No Ogg/FLAC support in the sndfile build on this platform yet - LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile + LIBS -= -lFLAC -lvorbis -lvorbisenc -lvorbisfile # These have different names LIBS -= -lsord-0 -lserd-0 diff -r 813bc4295860 -r 1a9541992121 repoint-lock.json --- a/repoint-lock.json Wed Jan 23 14:45:46 2019 +0000 +++ b/repoint-lock.json Fri Jan 25 12:29:12 2019 +0000 @@ -46,7 +46,7 @@ "pin": "6990f06c9f49" }, "sv-dependency-builds": { - "pin": "7aeed7906520" + "pin": "9e21af8f0420" }, "icons/scalable": { "pin": "1c8844bfa946"