From 30f39b7bc80001fedf31dc04eb1cb84de8bc3c8c Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 29 Sep 2021 15:41:20 +0200 Subject: [PATCH] GitHub CI [Win]: cineform build fix Picked from master but genereator is selected explicitly - here perhaps cmake from MSYS is used which defaults to Ninja. --- .github/scripts/Windows/prepare_msys.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index 2e75b211b..83ec7164d 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -65,6 +65,16 @@ if [ -n "$SDK_URL" ]; then rm -rf VideoMaster fi +build_cineform() { + ( + git submodule update --init cineform-sdk + cd cineform-sdk + cmake -DBUILD_STATIC=false -DBUILD_TOOLS=false -A x64 -G 'Visual Studio 16 2019' . + cmake --build . --config Release --parallel + cp Release/CFHDCodec.dll /usr/local/bin && cp Release/CFHDCodec.lib /usr/local/lib && cp Common/* /usr/local/include && cp libcineformsdk.pc /usr/local/lib/pkgconfig + ) +} + # Install SPOUT wget --no-verbose https://frakira.fi.muni.cz/~xpulec/SpoutSDK.zip # this is the SDK subdirectory installed by Spout installer unzip SpoutSDK.zip -d src @@ -77,6 +87,4 @@ wget --no-verbose https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared. # Install GPUJPEG ( wget --no-verbose https://github.com/CESNET/GPUJPEG/releases/download/continuous/GPUJPEG.zip && unzip GPUJPEG.zip && cp -r GPUJPEG/* /usr/local ) -# Build CineForm -( git submodule update --init cineform-sdk && cd cineform-sdk && cmake -DBUILD_STATIC=false -DBUILD_TOOLS=false -A x64 && MSBuild.exe CineFormSDK.sln -property:Configuration=Release && cp Release/CFHDCodec.dll /usr/local/bin && cp Release/CFHDCodec.lib /usr/local/lib && cp Common/* /usr/local/include && cp libcineformsdk.pc /usr/local/lib/pkgconfig ) - +build_cineform