Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 99a6f18

Browse files
committed
add create xcframework bundles option to ios.sh, fixes #351
1 parent 8af793f commit 99a6f18

File tree

13 files changed

+2601
-2685
lines changed

13 files changed

+2601
-2685
lines changed

Diff for: android.sh

+559-571
Large diffs are not rendered by default.

Diff for: build/ios-ffmpeg.sh

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ case ${ARCH} in
7979
BITCODE_FLAGS=""
8080
;;
8181
x86-64)
82+
ARCH_OPTIONS="--disable-asm"
8283
TARGET_CPU="x86_64"
8384
TARGET_ARCH="x86_64"
8485
NEON_FLAG=" --disable-neon"

Diff for: build/ios-kvazaar.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ case ${ARCH} in
3737
i386)
3838
BUILD_HOST="x86-apple-darwin"
3939
;;
40-
x86-64-mac-catalyst)
40+
x86-64 | x86-64-mac-catalyst)
4141
ARCH_OPTIONS="--disable-asm"
4242
BUILD_HOST=$(get_build_host)
4343
;;

Diff for: build/ios-libass.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
4040

4141
ARCH_OPTIONS=""
4242
case ${ARCH} in
43-
x86-64-mac-catalyst)
43+
x86-64 | x86-64-mac-catalyst)
4444
ARCH_OPTIONS="--disable-asm"
4545
;;
4646
*)

Diff for: build/ios-libvpx.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ case ${ARCH} in
6868
;;
6969
x86-64)
7070
TARGET="x86_64-iphonesimulator-gcc"
71-
ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512"
71+
ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512 --disable-sse --disable-sse2 --disable-mmx"
7272
;;
7373
x86-64-mac-catalyst)
7474
TARGET="x86_64-macosx-gcc"

Diff for: build/ios-openh264.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,12 @@ esac
5656

5757
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
5858

59-
# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES
59+
# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES - EXCEPT x86-64
6060
${SED_INLINE} 's/arm64 aarch64/arm64% aarch64/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
6161
${SED_INLINE} 's/%86 x86_64,/%86 x86_64 x86-64,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
6262
${SED_INLINE} 's/filter-out arm64,/filter-out arm64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
6363
${SED_INLINE} 's/CFLAGS += -DHAVE_NEON/#CFLAGS += -DHAVE_NEON/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
6464
${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm64)/ifneq (\$(filter arm64%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
65-
${SED_INLINE} 's/ifeq (\$(ASM_ARCH), x86)/ifneq (\$(filter %86 x86-64, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
6665
${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm)/ifneq (\$(filter armv%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
6766

6867
make clean 2>/dev/null 1>/dev/null

0 commit comments

Comments
 (0)