Mercurial > hg > sonic-visualiser
changeset 2186:b483f46e53eb bqaudiostream
Add MediaFoundation flags; subrepo updates; boldly refuse to continue when a test fails
| author | Chris Cannam |
|---|---|
| date | Thu, 17 Jan 2019 15:09:56 +0000 |
| parents | a889ccb50ec6 |
| children | 92c493792eaf |
| files | base.pri bq-files.pri deploy/win64/build-32.bat deploy/win64/build-64.bat noconfig.pri repoint-lock.json |
| diffstat | 6 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/base.pri Tue Jan 15 16:43:51 2019 +0000 +++ b/base.pri Thu Jan 17 15:09:56 2019 +0000 @@ -40,5 +40,4 @@ linux*: DEFINES += USE_PTHREADS macx*: DEFINES += USE_PTHREADS -CONFIG += qt thread warn_on stl rtti exceptions object_parallel_to_source - +CONFIG += qt thread warn_on stl rtti exceptions
--- a/bq-files.pri Tue Jan 15 16:43:51 2019 +0000 +++ b/bq-files.pri Thu Jan 17 15:09:56 2019 +0000 @@ -46,6 +46,6 @@ bqaudioio/src/SystemRecordSource.cpp \ bqaudiostream/src/AudioReadStream.cpp \ bqaudiostream/src/AudioReadStreamFactory.cpp \ - bqaudiostream/src/Exceptions.cpp \ + bqaudiostream/src/AudioStreamExceptions.cpp \ rubberband-all.cpp
--- a/deploy/win64/build-32.bat Tue Jan 15 16:43:51 2019 +0000 +++ b/deploy/win64/build-32.bat Thu Jan 17 15:09:56 2019 +0000 @@ -48,8 +48,12 @@ rem some of these expect to be run from the project root cd .. build_win32\release\test-svcore-base +if %errorlevel% neq 0 exit /b %errorlevel% build_win32\release\test-svcore-system +if %errorlevel% neq 0 exit /b %errorlevel% build_win32\release\test-svcore-data-fileio +if %errorlevel% neq 0 exit /b %errorlevel% build_win32\release\test-svcore-data-model +if %errorlevel% neq 0 exit /b %errorlevel% set PATH=%ORIGINALPATH%
--- a/deploy/win64/build-64.bat Tue Jan 15 16:43:51 2019 +0000 +++ b/deploy/win64/build-64.bat Thu Jan 17 15:09:56 2019 +0000 @@ -55,8 +55,12 @@ rem some of these expect to be run from the project root cd .. build_win64\release\test-svcore-base +if %errorlevel% neq 0 exit /b %errorlevel% build_win64\release\test-svcore-system +if %errorlevel% neq 0 exit /b %errorlevel% build_win64\release\test-svcore-data-fileio +if %errorlevel% neq 0 exit /b %errorlevel% build_win64\release\test-svcore-data-model +if %errorlevel% neq 0 exit /b %errorlevel% set PATH=%ORIGINALPATH%
--- a/noconfig.pri Tue Jan 15 16:43:51 2019 +0000 +++ b/noconfig.pri Thu Jan 17 15:09:56 2019 +0000 @@ -60,7 +60,7 @@ LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib - DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE + DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION QMAKE_CXXFLAGS_RELEASE += -ffast-math @@ -68,7 +68,7 @@ DEFINES -= HAVE_LIBLO LIBS -= -llo - LIBS += -lwinmm -lws2_32 + LIBS += -lmfplat -lmfreadwrite -lmfuuid -lwinmm -lws2_32 } win32-msvc* { @@ -91,7 +91,7 @@ -L$$PWD/sv-dependency-builds/win64-msvc/lib } - DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE + DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl QMAKE_LFLAGS_RELEASE += -ltcg @@ -107,7 +107,7 @@ DEFINES -= HAVE_LIBLO LIBS -= -llo - LIBS += -ladvapi32 -lwinmm -lws2_32 + LIBS += -lmfplat -lmfreadwrite -lmfuuid -ladvapi32 -lwinmm -lws2_32 } macx* {
--- a/repoint-lock.json Tue Jan 15 16:43:51 2019 +0000 +++ b/repoint-lock.json Thu Jan 17 15:09:56 2019 +0000 @@ -4,7 +4,7 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "b67f5b6a7978" + "pin": "0773b34d987f" }, "svgui": { "pin": "79032214f79d" @@ -13,7 +13,7 @@ "pin": "92ad94dee103" }, "checker": { - "pin": "0d2d3c89fdf6" + "pin": "5c60e26e16ca" }, "piper": { "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674" @@ -37,7 +37,7 @@ "pin": "8c4162878ae6" }, "bqaudiostream": { - "pin": "78e494fc4b05" + "pin": "37ea9d0d9df5" }, "bqthingfactory": { "pin": "7686116dcdd5"