maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #24625 from akien-mga/ios-sim-x86_64

Browse source 
SCons: Drop ios_sim option forcing x86, simulator needs x86_64
This commit is contained in:
Rémi Verschelde 2018-12-27 17:26:51 +01:00 committed by GitHub
parent daa50b28f2 95e96947f6
commit 9c135ad263
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/webm/libvpx/SCsub
View file

@ -271,7 +271,7 @@ if env["platform"] == 'uwp':
else:
import platform
is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and (platform.machine().startswith('arm') or platform.machine().startswith('aarch')))
is_ios_x86 = (env["platform"] == 'iphone' and env["ios_sim"])
is_ios_x86 = (env["platform"] == 'iphone' and ("arch" in env and env["arch"].startswith('x86')))
is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86')
if is_android_x86:
cpu_bits = '32'

6
platform/iphone/detect.py
View file

@ -29,7 +29,6 @@ def get_opts():
BoolVariable('icloud', 'Support for iCloud', True),
BoolVariable('ios_exceptions', 'Enable exceptions', False),
('ios_triple', 'Triple for ios toolchain', ''),
BoolVariable('ios_sim', 'Build simulator binary', False),
]
@ -64,10 +63,7 @@ def configure(env):
env.Append(LINKFLAGS=['-flto'])
## Architecture
if env["ios_sim"] and not ("arch" in env):
env["arch"] = "x86"
if env["arch"] == "x86": # i386, simulator
if env["arch"] == "x86": # i386
env["bits"] = "32"
elif env["arch"] == "x86_64":
env["bits"] = "64"