From fd7c2762e331f10f45a1656cb21b6c50c935af11 Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Mon, 30 Aug 2021 10:29:32 +0200 Subject: [PATCH] Update build.sh --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index c8f1dda..44135b2 100644 --- a/build.sh +++ b/build.sh @@ -58,8 +58,8 @@ function build_aom { MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration="$MSBUILD_CONFIG" AOM.sln cp $MSBUILD_CONFIG/aom.lib $BUILD/lib/aom.lib cp -r ../aom $BUILD/include/aom - #cmake -DAOM_CONFIG_DIR=. -DAOM_ROOT=.. -DCMAKE_INSTALL_PREFIX=@prefix@ -DCMAKE_PROJECT_NAME=aom -DCONFIG_MULTITHREAD=true -DHAVE_PTHREAD_H=false -P "../build/cmake/pkg_config.cmake" - #sed -i "s#@prefix@#$BUILD#g" aom.pc + cmake -DAOM_CONFIG_DIR=. -DAOM_ROOT=.. -DCMAKE_INSTALL_PREFIX=@prefix@ -DCMAKE_PROJECT_NAME=aom -DCONFIG_MULTITHREAD=true -DHAVE_PTHREAD_H=false -P "../build/cmake/pkg_config.cmake" + sed -i "s#@prefix@#$BUILD#g" aom.pc sed -i '/^Libs\.private.*/d' aom.pc #sed -i 's/-lm//' aom.pc cp aom.pc $BUILD/lib/pkgconfig/aom.pc @@ -258,7 +258,7 @@ git clone -q -b release/4.4 git://source.ffmpeg.org/ffmpeg.git $SRC/ffmpeg #build_x265 build_aom #build_libass - +exit cd $SRC/ffmpeg PKG_CONFIG_PATH=$BUILD/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --toolchain=msvc --extra-cflags="$CFLAGS -I$BUILD/include" --extra-ldflags="-LIBPATH:$BUILD/lib" --prefix=$BUILD --pkg-config-flags="--static" --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl $COMPONENTS sed -i 's/\x81/ue/g' config.h