asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7123 from zaps166/webm_iphone_x86

Browse source 
WebM: Fix iPhone x86 compilation
This commit is contained in:
Rémi Verschelde 2016-11-21 11:54:12 +01:00 committed by GitHub
commit 9df47f2c69
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/webm/libvpx/SCsub
View file

@ -263,14 +263,15 @@ if env["platform"] == 'uwp':
else: else:
webm_cpu_x86 = True webm_cpu_x86 = True
else: else:
is_ios_x86 = (env["platform"] == 'iphone' and env["ios_sim"] == "yes")
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'
if osx_fat: if osx_fat:
webm_cpu_x86 = True webm_cpu_x86 = True
else: else:
webm_cpu_x86 = (cpu_bits == '32' or cpu_bits == '64') and (env["platform"] == 'windows' or env["platform"] == 'x11' or env["platform"] == 'osx' or env["platform"] == 'haiku' or is_android_x86) webm_cpu_x86 = (cpu_bits == '32' or cpu_bits == '64') and (env["platform"] == 'windows' or env["platform"] == 'x11' or env["platform"] == 'osx' or env["platform"] == 'haiku' or is_android_x86 or is_ios_x86)
webm_cpu_arm = env["platform"] == 'iphone' or env["platform"] == 'bb10' or (env["platform"] == 'android' and env["android_arch"] != 'x86') webm_cpu_arm = (not is_ios_x86 and env["platform"] == 'iphone') or env["platform"] == 'bb10' or (not is_android_x86 and env["platform"] == 'android')
if webm_cpu_x86: if webm_cpu_x86:
import subprocess import subprocess
@ -308,7 +309,7 @@ if webm_cpu_x86:
else: else:
if env["platform"] == 'windows' or env["platform"] == 'uwp': if env["platform"] == 'windows' or env["platform"] == 'uwp':
env_libvpx["ASFORMAT"] = 'win' env_libvpx["ASFORMAT"] = 'win'
elif env["platform"] == 'osx': elif env["platform"] == 'osx' or env["platform"] == "iphone":
env_libvpx["ASFORMAT"] = 'macho' env_libvpx["ASFORMAT"] = 'macho'
else: else:
env_libvpx["ASFORMAT"] = 'elf' env_libvpx["ASFORMAT"] = 'elf'