Centrally define standard include/library paths

This commit is contained in:
BtbN 2020-09-04 17:09:48 +02:00
parent 012fed6771
commit 6961fa84d1
2 changed files with 4 additions and 4 deletions

View File

@ -44,6 +44,10 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash
cd ffmpeg cd ffmpeg
git checkout $GIT_BRANCH 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" ./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 -j\$(nproc)
make install make install

View File

@ -52,7 +52,3 @@ ffbuild_configure() {
ffbuild_unconfigure() { ffbuild_unconfigure() {
echo --disable-gmp echo --disable-gmp
} }
ffbuild_ldflags() {
echo -L"$FFBUILD_PREFIX"/lib
}