|
|
|
@ -227,14 +227,11 @@ get_common_cflags() { |
|
|
|
|
local LTS_BUILD_FLAG="-DFFMPEG_KIT_LTS " |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
case ${DETECTED_NDK_VERSION} in |
|
|
|
|
23*) |
|
|
|
|
echo "-fstrict-aliasing -DANDROID_NDK -fPIC -DANDROID ${LTS_BUILD_FLAG}-D__ANDROID__ -D__ANDROID_MIN_SDK_VERSION__=${API}" |
|
|
|
|
;; |
|
|
|
|
*) |
|
|
|
|
echo "-fno-integrated-as -fstrict-aliasing -DANDROID_NDK -fPIC -DANDROID ${LTS_BUILD_FLAG}-D__ANDROID__ -D__ANDROID_API__=${API}" |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
if [[ $(compare_versions "$DETECTED_NDK_VERSION" "23") -ge 0 ]]; then |
|
|
|
|
echo "-fstrict-aliasing -DANDROID_NDK -fPIC -DANDROID ${LTS_BUILD_FLAG}-D__ANDROID__ -D__ANDROID_MIN_SDK_VERSION__=${API}" |
|
|
|
|
else |
|
|
|
|
echo "-fno-integrated-as -fstrict-aliasing -DANDROID_NDK -fPIC -DANDROID ${LTS_BUILD_FLAG}-D__ANDROID__ -D__ANDROID_API__=${API}" |
|
|
|
|
fi |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
get_arch_specific_cflags() { |
|
|
|
@ -249,24 +246,18 @@ get_arch_specific_cflags() { |
|
|
|
|
echo "-march=armv8-a -DFFMPEG_KIT_ARM64_V8A" |
|
|
|
|
;; |
|
|
|
|
x86) |
|
|
|
|
case ${DETECTED_NDK_VERSION} in |
|
|
|
|
23*) |
|
|
|
|
echo "-march=i686 -mtune=generic -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_X86" |
|
|
|
|
;; |
|
|
|
|
*) |
|
|
|
|
echo "-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_X86" |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
if [[ $(compare_versions "$DETECTED_NDK_VERSION" "23") -ge 0 ]]; then |
|
|
|
|
echo "-march=i686 -mtune=generic -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_X86" |
|
|
|
|
else |
|
|
|
|
echo "-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_X86" |
|
|
|
|
fi |
|
|
|
|
;; |
|
|
|
|
x86-64) |
|
|
|
|
case ${DETECTED_NDK_VERSION} in |
|
|
|
|
23*) |
|
|
|
|
echo "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=generic -DFFMPEG_KIT_X86_64" |
|
|
|
|
;; |
|
|
|
|
*) |
|
|
|
|
echo "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64" |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
if [[ $(compare_versions "$DETECTED_NDK_VERSION" "23") -ge 0 ]]; then |
|
|
|
|
echo "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=generic -DFFMPEG_KIT_X86_64" |
|
|
|
|
else |
|
|
|
|
echo "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64" |
|
|
|
|
fi |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
} |
|
|
|
@ -1037,33 +1028,30 @@ set_toolchain_paths() { |
|
|
|
|
export CC=$(get_clang_host)-clang |
|
|
|
|
export CXX=$(get_clang_host)-clang++ |
|
|
|
|
|
|
|
|
|
if [ "$1" == "x264" ]; then |
|
|
|
|
export AS=${CC} |
|
|
|
|
else |
|
|
|
|
export AS=${HOST}-as |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
case ${ARCH} in |
|
|
|
|
arm64-v8a) |
|
|
|
|
export ac_cv_c_bigendian=no |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
case ${DETECTED_NDK_VERSION} in |
|
|
|
|
23*) |
|
|
|
|
export AR=llvm-ar |
|
|
|
|
export LD=lld |
|
|
|
|
export RANLIB=llvm-ranlib |
|
|
|
|
export STRIP=llvm-strip |
|
|
|
|
export NM=llvm-nm |
|
|
|
|
;; |
|
|
|
|
*) |
|
|
|
|
export AR=${HOST}-ar |
|
|
|
|
export LD=${HOST}-ld |
|
|
|
|
export RANLIB=${HOST}-ranlib |
|
|
|
|
export STRIP=${HOST}-strip |
|
|
|
|
export NM=${HOST}-nm |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
if [[ $(compare_versions "$DETECTED_NDK_VERSION" "23") -ge 0 ]]; then |
|
|
|
|
export AR=llvm-ar |
|
|
|
|
export LD=lld |
|
|
|
|
export RANLIB=llvm-ranlib |
|
|
|
|
export STRIP=llvm-strip |
|
|
|
|
export NM=llvm-nm |
|
|
|
|
export AS=$CC |
|
|
|
|
else |
|
|
|
|
export AR=${HOST}-ar |
|
|
|
|
export LD=${HOST}-ld |
|
|
|
|
export RANLIB=${HOST}-ranlib |
|
|
|
|
export STRIP=${HOST}-strip |
|
|
|
|
export NM=${HOST}-nm |
|
|
|
|
if [ "$1" == "x264" ]; then |
|
|
|
|
export AS=${CC} |
|
|
|
|
else |
|
|
|
|
export AS=${HOST}-as |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
export INSTALL_PKG_CONFIG_DIR="${BASEDIR}"/prebuilt/$(get_build_directory)/pkgconfig |
|
|
|
|
export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc" |
|
|
|
|
|
|
|
|
|