add create xcframework bundles option to ios.sh, fixes #351

tanersener · Mar 29, 2020 · 99a6f18 · 99a6f18
1 parent 8af793f
commit 99a6f18
Show file tree

Hide file tree

Showing 13 changed files with 2,601 additions and 2,685 deletions.
diff --git a/android.sh b/android.sh
diff --git a/build/ios-ffmpeg.sh b/build/ios-ffmpeg.sh
@@ -79,6 +79,7 @@ case ${ARCH} in
         BITCODE_FLAGS=""
     ;;
     x86-64)
+        ARCH_OPTIONS="--disable-asm"
         TARGET_CPU="x86_64"
         TARGET_ARCH="x86_64"
         NEON_FLAG="	--disable-neon"

diff --git a/build/ios-kvazaar.sh b/build/ios-kvazaar.sh
@@ -37,7 +37,7 @@ case ${ARCH} in
     i386)
         BUILD_HOST="x86-apple-darwin"
     ;;
-    x86-64-mac-catalyst)
+    x86-64 | x86-64-mac-catalyst)
         ARCH_OPTIONS="--disable-asm"
         BUILD_HOST=$(get_build_host)
     ;;

diff --git a/build/ios-libass.sh b/build/ios-libass.sh
@@ -40,7 +40,7 @@ export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
 
 ARCH_OPTIONS=""
 case ${ARCH} in
-    x86-64-mac-catalyst)
+    x86-64 | x86-64-mac-catalyst)
         ARCH_OPTIONS="--disable-asm"
     ;;
     *)

diff --git a/build/ios-libvpx.sh b/build/ios-libvpx.sh
@@ -68,7 +68,7 @@ case ${ARCH} in
     ;;
     x86-64)
         TARGET="x86_64-iphonesimulator-gcc"
-        ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512"
+        ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512 --disable-sse --disable-sse2 --disable-mmx"
     ;;
     x86-64-mac-catalyst)
         TARGET="x86_64-macosx-gcc"

diff --git a/build/ios-openh264.sh b/build/ios-openh264.sh
@@ -56,13 +56,12 @@ esac
 
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
-# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES
+# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES - EXCEPT x86-64
 ${SED_INLINE} 's/arm64 aarch64/arm64% aarch64/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/%86 x86_64,/%86 x86_64 x86-64,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/filter-out arm64,/filter-out arm64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/CFLAGS += -DHAVE_NEON/#CFLAGS += -DHAVE_NEON/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm64)/ifneq (\$(filter arm64%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), x86)/ifneq (\$(filter %86 x86-64, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
 ${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm)/ifneq (\$(filter armv%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
 
 make clean 2>/dev/null 1>/dev/null