1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 08:22:33 +02:00

Change build into gitlab-ci.yml

This commit is contained in:
Elias Steurer 2020-09-18 14:51:46 +02:00
parent 828bd81edd
commit beda4cef39
2 changed files with 14 additions and 7 deletions

View File

@ -26,7 +26,17 @@ build:windows:
paths:
- Common\vcpkg\
script:
- cmd /c `install_dependencies_windows.bat`
- git submodule update --init
- git submodule update --recursive
- cd Common
- git clone https://github.com/microsoft/vcpkg.git
- cd vcpkg
- git pull
- git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
- call bootstrap-vcpkg.bat
- vcpkg.exe install openssl --triplet x64-windows --recurse
- cd ..
- cd ..
- mkdir BUILD_WINDOWS
- cd BUILD_WINDOWS
- cmake.exe ../ -DCMAKE_PREFIX_PATH=c:/Qt/5.15.1/msvc2019 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.

View File

@ -19,12 +19,9 @@ rem We only need the content of the bin folder
rem --strip-components 2 removes folder
tar -xvf ffmpeg.zip --strip-components 2 ffmpeg-4.3.1-full_build/bin
rem Create ffmpeg folder
mkdir Common/ffmpeg
rem Remove not used ffplay
DEL ffplay.exe
rm ffplay.exe
rem Move ffmpeg into folder
move /Y ffmpeg.exe Common/ffmpeg
move /Y ffprobe.exe Common/ffmpeg
mv ffmpeg.exe Common/ffmpeg
mv ffprobe.exe Common/ffmpeg