From 861854a1b5208d343312de487912bc97629d1339 Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Wed, 26 May 2021 08:56:13 +0200 Subject: [PATCH] Update build.sh --- build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 1a7a857..f08d598 100644 --- a/build.sh +++ b/build.sh @@ -77,12 +77,13 @@ function build_svt { # # AV1 (patch needed for FFmpeg 4.3) git clone --depth 1 https://github.com/AOMediaCodec/SVT-AV1 $SRC/svt-av1 - cd $SRC/svt-av1/Build - cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG - MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /p:EB_DLL /property:TargetExt=.lib Source/Lib/Encoder/SvtAv1Enc.vcxproj - sed -i 's/C:/\/c/g' SvtAv1Enc.pc - cp -r ../Source/API $BUILD/include/svt-av1 ; cp ../Bin/$MSBUILD_CONFIG/SvtAv1Enc.lib $BUILD/lib/ ; cp SvtAv1Enc.pc $BUILD/lib/pkgconfig/ - add_comp libsvtav1 + cd $SRC/svt-av1/Build/windows + ./build.bat 2017 $MODE static + # cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG + # MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /p:EB_DLL /property:TargetExt=.lib Source/Lib/Encoder/SvtAv1Enc.vcxproj + # sed -i 's/C:/\/c/g' SvtAv1Enc.pc + # cp -r ../Source/API $BUILD/include/svt-av1 ; cp ../Bin/$MSBUILD_CONFIG/SvtAv1Enc.lib $BUILD/lib/ ; cp SvtAv1Enc.pc $BUILD/lib/pkgconfig/ + # add_comp libsvtav1 # # VP9 #git clone https://github.com/OpenVisualCloud/SVT-VP9.git $SRC/svt-vp9 @@ -254,6 +255,7 @@ git clone git://source.ffmpeg.org/ffmpeg.git $SRC/ffmpeg #build_amf #build_mfx build_svt +exit #build_ogg #build_vorbis #build_snappy