add iOS arm64_simulator arch and tvOS x86_64_simulator arch

Author: debugly

apple/compile-cfgs/meson-crossfiles/arm64-ios-simulator.meson

@@ -0,0 +1,31 @@
+# This is a cross compilation file from OSX (M1) to arm64
+# Apple keeps changing the location and names of files so
+# these might not work for you. Use the googels and xcrun.
+# https://mesonbuild.com/Reference-tables.html#cpu-families
+
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+objc = 'clang'
+objcpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+
+[built-in options]
+c_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+cpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+c_link_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+cpp_link_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+objc_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+objcpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
+
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer'
+has_function_printf = true
+has_function_hfkerhisadf = false
+
+[host_machine]
+system = 'darwin'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
+endian = 'little'

apple/compile-cfgs/meson-crossfiles/arm64-ios.meson

@@ -26,5 +26,5 @@ has_function_hfkerhisadf = false
 [host_machine]
 system = 'darwin'
 cpu_family = 'aarch64'
-cpu = 'arm64'
+cpu = 'aarch64'
 endian = 'little'

apple/compile-cfgs/meson-crossfiles/arm64-macos.meson

@@ -25,6 +25,6 @@ has_function_hfkerhisadf = false
 
 [host_machine]
 system = 'darwin'
-cpu_family = 'arm64'
-cpu = 'arm64'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
 endian = 'little'

apple/compile-cfgs/meson-crossfiles/arm64-tvos-simulator.meson

@@ -26,5 +26,5 @@ has_function_hfkerhisadf = false
 [host_machine]
 system = 'darwin'
 cpu_family = 'aarch64'
-cpu = 'arm64'
+cpu = 'aarch64'
 endian = 'little'

apple/compile-cfgs/meson-crossfiles/arm64-tvos.meson

@@ -26,5 +26,5 @@ has_function_hfkerhisadf = false
 [host_machine]
 system = 'darwin'
 cpu_family = 'aarch64'
-cpu = 'arm64'
+cpu = 'aarch64'
 endian = 'little'

apple/compile-cfgs/meson-crossfiles/x86_64-tvos-simulator.meson

@@ -0,0 +1,30 @@
+# This is a cross compilation file from OSX (x86_64) to M1
+# Apple keeps changing the location and names of files so
+# these might not work for you. Use the googels and xcrun.
+
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+objc = 'clang'
+objcpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+
+[built-in options]
+c_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+cpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+c_link_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+cpp_link_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+objc_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+objcpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
+
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer'
+has_function_printf = true
+has_function_hfkerhisadf = false
+
+[host_machine]
+system = 'darwin'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'

apple/do-compile/any.sh

@@ -78,29 +78,29 @@ do_lipo_all() {
 
     for arch in $archs; do
 
-        local ARCH_INC_DIR="$XC_PRODUCT_ROOT/$LIB_NAME-$arch/include"
+        local inc_src_dir="$XC_PRODUCT_ROOT/$LIB_NAME-$arch/include"
         if [[ $arch == *simulator ]];then
-            local UNI_DIR="$XC_UNI_SIM_PROD_DIR"
+            local uni_dir="$XC_UNI_SIM_PROD_DIR"
         else
-            local UNI_DIR="$XC_UNI_PROD_DIR"
+            local uni_dir="$XC_UNI_PROD_DIR"
         fi
 
-        local ARCH_OUT_DIR="$UNI_DIR/$LIB_NAME/include"
+        local inc_dst_dir="$uni_dir/$LIB_NAME/include"
 
-        if [[ -d "$ARCH_INC_DIR" && ! -d "$ARCH_OUT_DIR" ]]; then
-            echo "copy include dir to $ARCH_OUT_DIR"
-            cp -R "$ARCH_INC_DIR" "$ARCH_OUT_DIR"
+        if [[ -d "$inc_src_dir" ]]; then
+            echo "copy include dir to $inc_dst_dir"
+            cp -R "$inc_src_dir" "$inc_dst_dir"
 
-            local ARCH_PC_DIR="$XC_PRODUCT_ROOT/$LIB_NAME-$arch/lib/pkgconfig"
-            if ls ${ARCH_PC_DIR}/*.pc >/dev/null 2>&1;then
-                local UNI_PC_DIR="$UNI_DIR/$LIB_NAME/lib/pkgconfig/"
-                mkdir -p "$UNI_PC_DIR"
-                echo "copy pkgconfig file to $UNI_PC_DIR"
-                cp ${ARCH_PC_DIR}/*.pc "$UNI_PC_DIR"
+            local pc_src_dir="$XC_PRODUCT_ROOT/$LIB_NAME-$arch/lib/pkgconfig"
+            if ls ${pc_src_dir}/*.pc >/dev/null 2>&1;then
+                local pc_dst_dir="$uni_dir/$LIB_NAME/lib/pkgconfig/"
+                mkdir -p "$pc_dst_dir"
+                echo "copy pkgconfig file to $pc_dst_dir"
+                cp ${pc_src_dir}/*.pc "$pc_dst_dir"
                 #fix prefix path
-                p="$UNI_DIR/$LIB_NAME"
+                p="$uni_dir/$LIB_NAME"
                 escaped_p=$(echo $p | sed 's/\//\\\//g')
-                sed -i "" "s/^prefix=.*/prefix=$escaped_p/" "$UNI_PC_DIR/"*.pc
+                sed -i "" "s/^prefix=.*/prefix=$escaped_p/" "$pc_dst_dir/"*.pc
             fi
         fi
     done

apple/do-compile/freetype.sh

@@ -33,7 +33,7 @@ echo "XC_DEBUG:$XC_DEBUG"
 echo "===check env end==="
 
 # prepare build config
-CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --default-library static -Dpng=disabled"
+CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --default-library static -Dpng=disabled -Dharfbuzz=disabled"
 
 if [[ "$BUILD_OPT" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --buildtype=debug"

apple/do-compile/harfbuzz.sh

@@ -35,41 +35,34 @@ env_assert "XC_THREAD"
 echo "XC_DEBUG:$XC_DEBUG"
 echo "===check env end==="
 # prepare build config
-CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --default-library static"
+CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --default-library static -Ddocs=disabled -Dcairo=disabled -Dchafa=disabled -Dtests=disabled"
 
 if [[ "$BUILD_OPT" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --buildtype=debug"
 else
     CFG_FLAGS="$CFG_FLAGS --buildtype=release"
 fi
 
-MY_PKG_CONFIG_LIBDIR=''
-# with freetype
-if [[ -f "${XC_PRODUCT_ROOT}/freetype-$XC_ARCH/lib/pkgconfig/freetype2.pc" || -f "${XC_PRODUCT_ROOT}/universal/freetype/lib/pkgconfig/freetype2.pc" ]]; then
+echo "----------------------"
+echo "[*] check freetype"
+
+pkg-config --libs freetype2
+
+pkg-config --libs freetype2 --silence-errors >/dev/null && enable_freetype2=1
+
+if [[ $enable_freetype2 ]];then
     echo "[*] --enable-freetype"
-    if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
-        MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
-    fi
-    
-    if [[ -f "${XC_PRODUCT_ROOT}/freetype-$XC_ARCH/lib/pkgconfig/freetype2.pc" ]]; then
-        MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/freetype-$XC_ARCH/lib/pkgconfig"
-    else
-        MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/freetype/lib/pkgconfig"
-    fi
+    CFG_FLAGS="$CFG_FLAGS -Dfreetype=enabled"
 else
     echo "[*] --disable-freetype"
-fi
-
-if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
-    export PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR"
+    CFG_FLAGS="$CFG_FLAGS -Dfreetype=disabled"
 fi
 
 cd $XC_BUILD_SOURCE
 export CC="$XCRUN_CC"
 export CXX="$XCRUN_CXX"
 
 if [[ $(uname -m) != "$XC_ARCH" || "$XC_FORCE_CROSS" ]]; then
-    export PKG_CONFIG=$(which pkg-config)
     if [[ $XC_IS_SIMULATOR != 1 ]]; then
         echo "[*] cross compile, on $(uname -m) compile $XC_PLAT $XC_ARCH."
         CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../compile-cfgs/meson-crossfiles/$XC_ARCH-$XC_PLAT.meson"
@@ -83,7 +76,6 @@ echo "----------------------"
 echo "[*] compile $LIB_NAME"
 echo "CC: $XCRUN_CC"
 echo "CFG_FLAGS: $CFG_FLAGS"
-echo "PKG_CONFIG_LIBDIR: $MY_PKG_CONFIG_LIBDIR"
 echo "----------------------"
 echo
 
@@ -92,12 +84,12 @@ if [[ -d $build ]]; then
     rm -rf $build
 fi
 
-meson setup $build $CFG_FLAGS 1>/dev/null
-
-cd $build
 # show all configure
 # https://mesonbuild.com/Build-options.html
-# meson configure
-meson configure -Ddocs=disabled -Dcairo=disabled -Dchafa=disabled -Dfreetype=enabled -Dtests=disabled
-meson compile
-meson install 1>/dev/null
+meson setup $build $CFG_FLAGS
+
+cd $build
+
+echo "compile"
+
+meson compile && meson install

apple/init-env.sh

@@ -61,13 +61,13 @@ function init_plat_env() {
 
     if [[ "$XC_PLAT" == 'ios' ]]; then
         export XC_OTHER_CFLAGS="-fembed-bitcode"
-        ALL_ARCHS="arm64 x86_64_simulator"
+        ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
     elif [[ "$XC_PLAT" == 'macos' ]]; then
         export XC_OTHER_CFLAGS=""
         ALL_ARCHS="x86_64 arm64"
     elif [[ "$XC_PLAT" == 'tvos' ]]; then
         export XC_OTHER_CFLAGS=''
-        ALL_ARCHS="arm64 arm64_simulator"
+        ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
     fi
 
     if [[ -z "$XC_ALL_ARCHS" ]];then
@@ -139,7 +139,7 @@ function init_arch_env () {
 
     if [[ "$XC_PLAT" == 'ios' ]]; then
         case $_XC_ARCH in
-            'x86_64_simulator')
+            *_simulator)
                 export XCRUN_PLATFORM='iPhoneSimulator'
                 export XC_DEPLOYMENT_TARGET='-mios-simulator-version-min=11.0'
                 export XC_IS_SIMULATOR=1
@@ -148,14 +148,18 @@ function init_arch_env () {
                 export XCRUN_PLATFORM='iPhoneOS'
                 export XC_DEPLOYMENT_TARGET='-miphoneos-version-min=11.0'
             ;;
+            *)
+                echo "wrong arch:$_XC_ARCH for $XC_PLAT"
+                exit 1
+            ;;
         esac
     elif [[ "$XC_PLAT" == 'macos' ]]; then
         export XCRUN_PLATFORM='MacOSX'
         export MACOSX_DEPLOYMENT_TARGET=10.11
         export XC_DEPLOYMENT_TARGET="-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
     elif [[ "$XC_PLAT" == 'tvos' ]]; then
         case $_XC_ARCH in
-            'arm64_simulator')
+            *_simulator)
                 export XCRUN_PLATFORM='AppleTVSimulator'
                 export XC_DEPLOYMENT_TARGET="-mtvos-simulator-version-min=12.0"
                 export XC_IS_SIMULATOR=1
@@ -164,6 +168,10 @@ function init_arch_env () {
                 export XCRUN_PLATFORM='AppleTVOS'
                 export XC_DEPLOYMENT_TARGET="-mtvos-version-min=12.0"
             ;;
+            *)
+                echo "wrong arch:$_XC_ARCH for $XC_PLAT"
+                exit 1
+            ;;
         esac
     fi