From 6961fa84d145b77278621c7ec8104935c2a35587 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 4 Sep 2020 17:09:48 +0200 Subject: [PATCH] Centrally define standard include/library paths --- build.sh | 4 ++++ scripts.d/25-gmp.sh | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index d6ddfcb..cb9935b 100755 --- a/build.sh +++ b/build.sh @@ -44,6 +44,10 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash cd ffmpeg git checkout $GIT_BRANCH + export CFLAGS="\$CFLAGS -I\${FFBUILD_PREFIX}/include" + export CXXFLAGS="\$CXXFLAGS -I\${FFBUILD_PREFIX}/include" + export LDFLAGS="\$LDFLAGS -L\${FFBUILD_PREFIX}/lib" + ./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" --extra-ldflags="$FF_LDFLAGS" make -j\$(nproc) make install diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 21ca876..55b47e3 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -52,7 +52,3 @@ ffbuild_configure() { ffbuild_unconfigure() { echo --disable-gmp } - -ffbuild_ldflags() { - echo -L"$FFBUILD_PREFIX"/lib -}