Skip to content

Commit

Permalink
script changes
Browse files Browse the repository at this point in the history
  • Loading branch information
1Conan committed Aug 25, 2023
1 parent 09ecfc3 commit 317916e
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 15 deletions.
18 changes: 18 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh

./ios.sh -s -x \
--target=15.0 \
--disable-armv7 \
--disable-armv7s \
--disable-arm64-mac-catalyst \
--disable-arm64e \
--disable-i386 \
--disable-x86-64 \
--disable-x86-64-mac-catalyst \
--enable-libvpx \
--enable-libvorbis \
--enable-ios-audiotoolbox \
--enable-ios-zlib \
--enable-ios-bzip2 \
--enable-ios-libiconv \
--no-bitcode
6 changes: 1 addition & 5 deletions scripts/apple/ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -537,11 +537,6 @@ ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR
--disable-schannel \
--disable-securetransport \
--disable-xlib \
--disable-cuda \
--disable-cuvid \
--disable-nvenc \
--disable-vaapi \
--disable-vdpau \
--disable-alsa \
--disable-cuda \
--disable-cuvid \
Expand All @@ -554,6 +549,7 @@ ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR
--enable-muxer=webp \
--enable-protocol=file \
--enable-filter=scale,null,format \
--enable-lto \
${CONFIGURE_POSTFIX} 1>>"${BASEDIR}"/build.log 2>&1

if [[ $? -ne 0 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/apple/libvpx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ esac
--enable-optimizations \
--enable-better-hw-compatibility \
${ASM_OPTIONS} \
--disable-vp8 \
--enable-vp9 \
--enable-multithread \
--enable-spatial-resampling \
--enable-small \
--enable-static \
--disable-vp8 \
--disable-realtime-only \
--disable-shared \
--disable-debug \
Expand Down
18 changes: 9 additions & 9 deletions scripts/function-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ get_size_optimization_cflags() {
local ARCH_OPTIMIZATION=""
case ${ARCH} in
armv7 | armv7s | arm64 | arm64e | *-mac-catalyst)
ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
ARCH_OPTIMIZATION="-Os -ffunction-sections -fdata-sections -Wno-ignored-optimization-argument"
;;
i386 | x86-64 | arm64-simulator)
ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
ARCH_OPTIMIZATION="-Os -ffunction-sections -fdata-sections -Wno-ignored-optimization-argument"
;;
esac

Expand All @@ -174,10 +174,10 @@ get_size_optimization_asm_cflags() {
jpeg | ffmpeg)
case ${ARCH} in
armv7 | armv7s | arm64 | arm64e | *-mac-catalyst)
ARCH_OPTIMIZATION="-Oz"
ARCH_OPTIMIZATION="-Os"
;;
i386 | x86-64 | arm64-simulator)
ARCH_OPTIMIZATION="-O2"
ARCH_OPTIMIZATION="-Os"
;;
esac
;;
Expand Down Expand Up @@ -273,7 +273,7 @@ get_asmflags() {
get_cxxflags() {
local COMMON_CFLAGS="$(get_common_cflags "$1") $(get_common_includes "$1") $(get_arch_specific_cflags) $(get_min_version_cflags "$1")"
if [[ -z ${FFMPEG_KIT_DEBUG} ]]; then
local OPTIMIZATION_FLAGS="-Oz"
local OPTIMIZATION_FLAGS="-Os"
else
local OPTIMIZATION_FLAGS="${FFMPEG_KIT_DEBUG}"
fi
Expand Down Expand Up @@ -328,20 +328,20 @@ get_size_optimization_ldflags() {
armv7 | armv7s | arm64 | arm64e | *-mac-catalyst)
case $1 in
ffmpeg | ffmpeg-kit)
echo "-Oz -dead_strip"
echo "-Os -dead_strip"
;;
*)
echo "-Oz -dead_strip"
echo "-Os -dead_strip"
;;
esac
;;
*)
case $1 in
ffmpeg)
echo "-O2"
echo "-Os -dead_strip"
;;
*)
echo "-O2"
echo "-Os -dead_strip"
;;
esac
;;
Expand Down

0 comments on commit 317916e

Please sign in to comment.