xcode > 14.3 apple silicon use arm64 arch for ios simulation。 (#214)

Author: oahcy

.github/workflows/native-compile-platforms.yml

@@ -483,8 +483,8 @@ jobs:
           echo "set(CC_USE_GLES3 OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-mac/proj/cfg.cmake
           # Test JSVM v8 backend on macOS.
-          echo "set(USE_SE_V8 OFF)" >> build-mac/proj/cfg.cmake
-          echo "set(USE_SE_JSVM ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_V8 ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_JSVM OFF)" >> build-mac/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-mac/proj/cfg.cmake
           echo "set(CC_EXECUTABLE_NAME \"\")" >> build-mac/proj/cfg.cmake
@@ -493,7 +493,6 @@ jobs:
           RES_DIR=$GITHUB_WORKSPACE/templates/mac/build-mac
           cd build-mac
           cmake ../ -GXcode -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           cmake --build . --config Release -- -jobs $NUM_OF_CORES -arch ${{ matrix.config.arch }}
           echo "Compile MacOSX Release Done!"
 
@@ -534,7 +533,7 @@ jobs:
           echo "set(CC_USE_VULKAN OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_GLES2 OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-ios/proj/cfg.cmake
-          echo "set(TARGET_IOS_VERSION 12.0)" >> build-ios/proj/cfg.cmake
+          echo "set(TARGET_IOS_VERSION 13.0)" >> build-ios/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-ios/proj/cfg.cmake
           echo "set(USE_DRAGONBONES OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED OFF)" >> build-ios/proj/cfg.cmake
@@ -548,7 +547,6 @@ jobs:
               -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} \
               -DRES_DIR=$RES_DIR \
               -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           #cmake --build . --config Debug -- -quiet -jobs $NUM_OF_CORES -allowProvisioningUpdates CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           cmake --build . --config Debug -- -jobs $NUM_OF_CORES CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           echo "Compile iOS Done!"

native/CMakeLists.txt

@@ -3725,9 +3725,14 @@ if(APPLE)
         "$(inherited)"
         ${CC_EXTERNAL_LIBS}
     )
+    if(CMAKE_OSX_ARCHITECTURES)
+        set(_CC_ENGINE_ARCHS "${CMAKE_OSX_ARCHITECTURES}")
+    else()
+        set(_CC_ENGINE_ARCHS "arm64;x86_64")
+    endif()
     set_target_properties(${ENGINE_NAME} PROPERTIES
         XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "YES"
-        OSX_ARCHITECTURES "arm64;x86_64"
+        OSX_ARCHITECTURES "${_CC_ENGINE_ARCHS}"
         ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/archives
     )
     if(MACOSX)
@@ -3739,9 +3744,9 @@ if(APPLE)
         )
     elseif(IOS)
 
-        if("${XCODE_VERSION}" VERSION_GREATER_EQUAL "15.0")
-            # For Xcode 15 and newer, add extra link flags to fix crash in __cxx_global_var_init.
-            message(STATUS "Using Xcode 15 or newer, adding extra link flags: -Wl,-ld_classic.")
+        if("${XCODE_VERSION}" VERSION_GREATER_EQUAL "15.0" AND "${XCODE_VERSION}" VERSION_LESS "15.1")
+            # Xcode 15.0 new linker crashes on weak symbols (114813650), fixed in 15.1.
+            message(STATUS "Xcode ${XCODE_VERSION}: adding -Wl,-ld_classic to work around weak symbol crash.")
             target_link_options(${ENGINE_NAME} PUBLIC -Wl,-ld_classic)
         endif()
 

native/cmake/predefine.cmake

@@ -126,7 +126,7 @@ if("$ENV{COCOS_ENGINE_DEV}" EQUAL "1")
     set(WERROR_FLAGS "-Werror -Werror=return-type") # -Wshorten-64-to-32 -Werror=return-type
 
     if(APPLE)
-        set(WERROR_FLAGS " ${WERROR_FLAGS} -Wno-deprecated-declarations -Wno-deprecated-builtins -Wno-unqualified-std-cast-call")
+        set(WERROR_FLAGS " ${WERROR_FLAGS} -Wno-deprecated-declarations -Wno-deprecated-builtins -Wno-unqualified-std-cast-call -Wno-nontrivial-memcall")
     elseif(LINUX)
         set(WERROR_FLAGS " ${WERROR_FLAGS} -Wno-nullability-completeness -Wno-deprecated-declarations")
     elseif(ANDROID)

native/external-config.json

@@ -3,6 +3,6 @@
         "type": "github",
         "owner": "cocos",
         "name": "cocos-engine-external",
-        "checkout": "v4.0.0-4"
+        "checkout": "v4.0.0-6"
     }
 }

templates/cmake/apple.cmake

@@ -81,7 +81,7 @@ macro(cc_ios_after_target _target_name)
         MACOSX_DEPLOYMENT_TARGET "${TARGET_IOS_VERSION}"
         XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${TARGET_IOS_VERSION}"
         XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}"
-        OSX_ARCHITECTURES "arm64;x86_64"
+        OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}"
         XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer"
         XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
         XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_LAUNCHSTORYBOARD_NAME "LaunchScreen"
@@ -95,12 +95,20 @@ macro(cc_ios_after_target _target_name)
 
     cc_apple_set_launch_type(${CC_EXECUTABLE_NAME})
 
-    # # exclude arm64 arch and specify x86_64 for iphonesimulator by default, this will apply to both target.
-    set(CMAKE_XCODE_ATTRIBUTE_EXCLUDED_ARCHS[sdk=iphonesimulator*] "arm64")
-    set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64")
-    set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64")
-    set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64")
-    set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64")
+    # exclude arm64 arch and specify x86_64 for iphonesimulator by default, this will apply to both target.
+    if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_EXCLUDED_ARCHS[sdk=iphonesimulator*] "")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "arm64")
+    else()
+        set(CMAKE_XCODE_ATTRIBUTE_EXCLUDED_ARCHS[sdk=iphonesimulator*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64")
+    endif()
 
     set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
 

templates/common/CMakeLists.txt

@@ -4,7 +4,7 @@ set(RES_DIR             ""  CACHE STRING "Resource path")
 set(COCOS_X_PATH        ""  CACHE STRING "Path to engine/native/")
 
 set(TARGET_OSX_VERSION "10.14" CACHE STRING "Target MacOSX version" FORCE)
-set(TARGET_IOS_VERSION "11.0"  CACHE STRING "Target iOS version" FORCE)
+set(TARGET_IOS_VERSION "13.0"  CACHE STRING "Target iOS version" FORCE)
 
 set(CMAKE_CXX_STANDARD 17)
 option(CC_DEBUG_FORCE           "Force enable CC_DEBUG in release mode" OFF)

templates/ios/CMakeLists.txt

@@ -5,6 +5,15 @@ set(APP_NAME "CocosGame"  CACHE STRING "Project Name")
 
 project(${APP_NAME} CXX)
 
+# Xcode 14.3+ no longer supports running under Rosetta on Apple Silicon,
+# so iOS Simulator must use arm64 instead of x86_64.
+# See: https://developer.apple.com/documentation/xcode-release-notes/xcode-14_3-release-notes
+if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64" AND "${XCODE_VERSION}" VERSION_GREATER_EQUAL "14.3")
+    set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "" FORCE)
+else()
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+endif()
+
 set(CC_PROJECT_DIR ${CMAKE_CURRENT_LIST_DIR})
 set(CC_UI_RESOURCES)
 set(CC_PROJ_SOURCES)