fix ios build problem (#292)

This commit is contained in:
yangchao
2026-08-23 12:01:54 +08:00
committed by GitHub
parent f81094f226
commit 469614cf0b
6 changed files with 44 additions and 15 deletions
+1 -1
View File
@@ -3,6 +3,6 @@
"type": "github",
"owner": "cocos",
"name": "cocos-engine-external",
"checkout": "v4.0.0-7"
"checkout": "v4.0.0-9"
}
}
@@ -1,9 +1,9 @@
import { execSync, spawn } from 'child_process';
import { execSync } from 'child_process';
import * as fs from 'fs-extra';
import * as ps from 'path';
import * as os from 'os';
import { CocosParams } from '../base/default';
import { cchelper, toolHelper, Paths } from "../utils";
import { cchelper, toolHelper } from "../utils";
import { MacOSPackTool } from "./mac-os";
export interface IOrientation {
@@ -115,13 +115,8 @@ export class IOSPackTool extends MacOSPackTool {
throw new Error("Error: Try to build iphoneos application but no developer team id was given!");
}
const nativePrjDir = this.paths.nativePrjDir;
const simulatorArch = this.getIosSimulatorArch();
const projName = this.params.projectName;
const os = require('os');
const cpus = os.cpus();
const model = (cpus && cpus[0] && cpus[0].model) ? cpus[0].model : '';
// check mac architecture
// const platform = /Apple/.test(model) ? `-arch arm64` : `-arch x86_64`;
// get xcode workspace
const regex = new RegExp(projName + '.xcworkspace$');
const files = fs.readdirSync(nativePrjDir);
@@ -145,7 +140,7 @@ export class IOSPackTool extends MacOSPackTool {
await toolHelper.runCmake([projCompileParams, '-sdk', 'iphoneos', `-arch arm64`]);
}
if (options.simulator) {
await toolHelper.runCmake([projCompileParams, '-sdk', 'iphonesimulator', `-arch x86_64`]); //force compile x86_64 app for iPhone simulator on Mac
await toolHelper.runCmake([projCompileParams, '-sdk', 'iphonesimulator', `-arch ${simulatorArch}`]);
}
}
return true;
@@ -51,10 +51,36 @@ export abstract class MacOSPackTool extends NativePackTool {
return /Apple/.test(model) && process.platform === 'darwin';
}
protected getXcodeMajorVerion(): number {
protected compareVersion(a: string, b: string): number {
const aParts = a.split('.').map((part) => Number.parseInt(part, 10) || 0);
const bParts = b.split('.').map((part) => Number.parseInt(part, 10) || 0);
const maxLength = Math.max(aParts.length, bParts.length);
for (let i = 0; i < maxLength; i++) {
const aValue = aParts[i] ?? 0;
const bValue = bParts[i] ?? 0;
if (aValue !== bValue) {
return aValue - bValue;
}
}
return 0;
}
protected getXcodeVersion(): string {
try {
const output = execSync('xcrun xcodebuild -version').toString('utf8');
return Number.parseInt(output.match(/Xcode\s(\d+)\.\d+/)![1]);
const match = output.match(/Xcode\s+(\d+(?:\.\d+)+)/);
return match?.[1] || '0.0';
} catch (e) {
console.error(e);
return '0.0';
}
}
protected getXcodeMajorVerion(): number {
try {
return Number.parseInt(this.getXcodeVersion().split('.')[0] || '0', 10);
} catch (e) {
console.error(e);
// fallback to default Xcode version
@@ -62,6 +88,14 @@ export abstract class MacOSPackTool extends NativePackTool {
}
}
protected getIosSimulatorArch(): 'arm64' | 'x86_64' {
// Xcode 14.3+ no longer supports running iOS Simulator under Rosetta on Apple Silicon.
if (this.isAppleSilicon() && this.compareVersion(this.getXcodeVersion(), '14.3') >= 0) {
return 'arm64';
}
return 'x86_64';
}
async modifyXcodeProject() {
if (this.params.platformParams.skipUpdateXcodeProject) {
if (this.getXcodeMajorVerion() < 12) {
+1 -1
View File
@@ -6,7 +6,7 @@ endif()
if(POLICY CMP0111)
# https://cmake.org/cmake/help/latest/policy/CMP0111.html
cmake_policy(SET CMP0111 OLD)
cmake_policy(SET CMP0111 NEW)
endif()
# set(CC_REGISTERED_PLUGINS)
+1 -1
View File
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.28)
set(CMAKE_SYSTEM_NAME iOS)
set(APP_NAME "CocosGame" CACHE STRING "Project Name")
+1 -1
View File
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.28)
set(APP_NAME "CocosGame" CACHE STRING "Project Name")
option(ENABLE_SANDBOX "enable sandbox entitlements.plist" ON)