# HG changeset patch # User Chris Cannam # Date 1547822785 0 # Node ID 92c493792eaf5a1d7b23cda4354e4fb72dba32a0 # Parent b483f46e53ebf3cc4def43c6eb06f0f415697a30 Update for more MediaFoundation bits & testing diff -r b483f46e53eb -r 92c493792eaf .hgignore --- a/.hgignore Thu Jan 17 15:09:56 2019 +0000 +++ b/.hgignore Fri Jan 18 14:46:25 2019 +0000 @@ -54,6 +54,7 @@ glob:.repoint* build_win32 build_win64 +build_win64_debug *.AppImage *.AppDir Dockerfile*.gen diff -r b483f46e53eb -r 92c493792eaf deploy/win64/build-64-debug.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/win64/build-64-debug.bat Fri Jan 18 14:46:25 2019 +0000 @@ -0,0 +1,69 @@ +rem Run this from within the top-level SV dir: deploy\win64\build-64.bat +rem To build from clean, delete the folder build_win64_debug first + +rem NB you will probably also have to change the CONFIG in noconfig.pri +rem from release to debug + +echo on + +set STARTPWD=%CD% + +set QTDIR=C:\Qt\5.11.2\msvc2017_64 +if not exist %QTDIR% ( +@ echo Could not find 64-bit Qt +@ exit /b 2 +) + +if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( +@ echo "Could not find MSVC vars batch file" +@ exit /b 2 +) + +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 + +set ORIGINALPATH=%PATH% +set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin + +cd %STARTPWD% + +call .\repoint install +if %errorlevel% neq 0 exit /b %errorlevel% + +sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp +if %errorlevel% neq 0 exit /b %errorlevel% + +mkdir build_win64_debug +cd build_win64_debug + +qmake -spec win32-msvc -r -tp vc ..\sonic-visualiser.pro +if %errorlevel% neq 0 exit /b %errorlevel% + +msbuild sonic-visualiser.sln /t:Build /p:Configuration=Debug +if %errorlevel% neq 0 exit /b %errorlevel% + +copy .\checker\debug\vamp-plugin-load-checker.exe .\debug + +copy %QTDIR%\bin\Qt5Cored.dll .\debug +copy %QTDIR%\bin\Qt5Guid.dll .\debug +copy %QTDIR%\bin\Qt5Widgetsd.dll .\debug +copy %QTDIR%\bin\Qt5Networkd.dll .\debug +copy %QTDIR%\bin\Qt5Xmld.dll .\debug +copy %QTDIR%\bin\Qt5Svgd.dll .\debug +copy %QTDIR%\bin\Qt5Testd.dll .\debug +copy %QTDIR%\plugins\platforms\qminimald.dll .\debug +copy %QTDIR%\plugins\platforms\qwindowsd.dll .\debug +copy %QTDIR%\plugins\styles\qwindowsvistastyled.dll .\debug +copy ..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll .\debug + +rem some of these expect to be run from the project root +cd .. +build_win64_debug\debug\test-svcore-base +if %errorlevel% neq 0 exit /b %errorlevel% +build_win64_debug\debug\test-svcore-system +if %errorlevel% neq 0 exit /b %errorlevel% +build_win64_debug\debug\test-svcore-data-fileio +if %errorlevel% neq 0 exit /b %errorlevel% +build_win64_debug\debug\test-svcore-data-model +if %errorlevel% neq 0 exit /b %errorlevel% + +set PATH=%ORIGINALPATH% diff -r b483f46e53eb -r 92c493792eaf noconfig.pri --- a/noconfig.pri Thu Jan 17 15:09:56 2019 +0000 +++ b/noconfig.pri Fri Jan 18 14:46:25 2019 +0000 @@ -68,7 +68,7 @@ DEFINES -= HAVE_LIBLO LIBS -= -llo - LIBS += -lmfplat -lmfreadwrite -lmfuuid -lwinmm -lws2_32 + LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -lwinmm -lws2_32 } win32-msvc* { @@ -107,7 +107,7 @@ DEFINES -= HAVE_LIBLO LIBS -= -llo - LIBS += -lmfplat -lmfreadwrite -lmfuuid -ladvapi32 -lwinmm -lws2_32 + LIBS += -lmfplat -lmfreadwrite -lmfuuid -lpropsys -ladvapi32 -lwinmm -lws2_32 } macx* { diff -r b483f46e53eb -r 92c493792eaf repoint-lock.json --- a/repoint-lock.json Thu Jan 17 15:09:56 2019 +0000 +++ b/repoint-lock.json Fri Jan 18 14:46:25 2019 +0000 @@ -4,7 +4,7 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "0773b34d987f" + "pin": "2f8ee436e858" }, "svgui": { "pin": "79032214f79d" @@ -37,7 +37,7 @@ "pin": "8c4162878ae6" }, "bqaudiostream": { - "pin": "37ea9d0d9df5" + "pin": "fcd8c44a4ced" }, "bqthingfactory": { "pin": "7686116dcdd5"