From d8b49cdd8d6af7f6b31055bc0f36671a6f71b18b Mon Sep 17 00:00:00 2001 From: xufuji456 Date: Wed, 27 Apr 2022 14:22:23 +0800 Subject: [PATCH] Feature: change to 64bits as default --- shell/ffmpeg/build_ffmpeg_mp3.sh | 8 ++++---- shell/ffmpeg/build_ffmpeg_one.sh | 8 ++++---- shell/ffmpeg/build_ffmpeg_x264.sh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shell/ffmpeg/build_ffmpeg_mp3.sh b/shell/ffmpeg/build_ffmpeg_mp3.sh index 2691747..f6e0e5c 100644 --- a/shell/ffmpeg/build_ffmpeg_mp3.sh +++ b/shell/ffmpeg/build_ffmpeg_mp3.sh @@ -6,7 +6,7 @@ cd ../ set -e -archbit=32 +archbit=64 if [ $archbit -eq 32 ];then echo "build for 32bit" @@ -35,9 +35,9 @@ export TOOLCHAIN=$PREBUILT/darwin-x86_64 export PREFIX=../ffmpeg-android/$ABI export ADDITIONAL_CONFIGURE_FLAG="--cpu=$NATIVE_CPU" -LAMEDIR=$PREFIX -export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$LAMEDIR/include" -export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$LAMEDIR/lib" +THIRD_LIB=$PREFIX +export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$THIRD_LIB/include" +export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$THIRD_LIB/lib" build_one(){ ./configure --target-os=android --prefix=$PREFIX \ diff --git a/shell/ffmpeg/build_ffmpeg_one.sh b/shell/ffmpeg/build_ffmpeg_one.sh index 0dfc1ca..a3e01cf 100644 --- a/shell/ffmpeg/build_ffmpeg_one.sh +++ b/shell/ffmpeg/build_ffmpeg_one.sh @@ -6,7 +6,7 @@ cd ../ set -e -archbit=32 +archbit=64 if [ $archbit -eq 32 ];then echo "build for 32bit" @@ -37,9 +37,9 @@ export TOOLCHAIN=$PREBUILT/darwin-x86_64 export PREFIX=../ffmpeg-android/$ABI export ADDITIONAL_CONFIGURE_FLAG="--cpu=$NATIVE_CPU" -LAMEDIR=$PREFIX -export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$LAMEDIR/include" -export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$LAMEDIR/lib" +THIRD_LIB=$PREFIX +export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$THIRD_LIB/include" +export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$THIRD_LIB/lib" build_one(){ ./configure --target-os=android --prefix=$PREFIX \ diff --git a/shell/ffmpeg/build_ffmpeg_x264.sh b/shell/ffmpeg/build_ffmpeg_x264.sh index ede8a9e..01ed55c 100644 --- a/shell/ffmpeg/build_ffmpeg_x264.sh +++ b/shell/ffmpeg/build_ffmpeg_x264.sh @@ -6,7 +6,7 @@ cd ../ set -e -archbit=32 +archbit=64 if [ $archbit -eq 32 ];then echo "build for 32bit" @@ -35,9 +35,9 @@ export TOOLCHAIN=$PREBUILT/darwin-x86_64 export PREFIX=../ffmpeg-android/$ABI export ADDITIONAL_CONFIGURE_FLAG="--cpu=$NATIVE_CPU" -X264DIR=$PREFIX -export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$X264DIR/include" -export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$X264DIR/lib" +THIRD_LIB=$PREFIX +export EXTRA_CFLAGS="-Os -fPIC $OPTIMIZE_CFLAGS -I$THIRD_LIB/include" +export EXTRA_LDFLAGS="-lc -lm -ldl -llog -lgcc -lz -L$THIRD_LIB/lib" build_one(){ ./configure --target-os=android --prefix=$PREFIX \