godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Deprecate ios_sim option forcing x86, simulator needs x86_64 

(cherry picked from commit 95e96947f6)
This commit is contained in:
Rémi Verschelde 2018-12-27 13:42:15 +01:00
parent 49929c1e57
commit 9b226e60e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webm/libvpx/SCsub
View File

@ -265,7 +265,7 @@ if env["platform"] == 'uwp':
else: else:
import platform 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_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') is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86')
if is_android_x86: if is_android_x86:
cpu_bits = '32' cpu_bits = '32'

2
platform/iphone/detect.py
View File

@ -30,7 +30,7 @@ def get_opts():
BoolVariable('icloud', 'Support for iCloud', True), BoolVariable('icloud', 'Support for iCloud', True),
BoolVariable('ios_exceptions', 'Enable exceptions', False), BoolVariable('ios_exceptions', 'Enable exceptions', False),
('ios_triple', 'Triple for ios toolchain', ''), ('ios_triple', 'Triple for ios toolchain', ''),
BoolVariable('ios_sim', 'Build simulator binary', False), BoolVariable('ios_sim', 'Build simulator binary (deprecated, use arch=x86 or arch=x86_64)', False),
] ]