diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-21 11:54:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 11:54:12 +0100 |
| commit | 9df47f2c69f2649a35e44dddf97d066b3f49f88e (patch) | |
| tree | 579edad74c9731f03ba2a792e255c3a2e53dbd67 | |
| parent | 6b2db2f1b693da230346925fa6ac3bba67e06bfb (diff) | |
| parent | a7f76e1b13b68dcae09bb0e4015bff0a69b262c4 (diff) | |
Merge pull request #7123 from zaps166/webm_iphone_x86
WebM: Fix iPhone x86 compilation
| -rw-r--r-- | modules/webm/libvpx/SCsub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 365cabd072..a6b9e46ee8 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -263,14 +263,15 @@ if env["platform"] == 'uwp': else: webm_cpu_x86 = True else: + is_ios_x86 = (env["platform"] == 'iphone' and env["ios_sim"] == "yes") is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86') if is_android_x86: cpu_bits = '32' if osx_fat: webm_cpu_x86 = True 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_arm = env["platform"] == 'iphone' or env["platform"] == 'bb10' or (env["platform"] == 'android' and env["android_arch"] != '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 = (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: import subprocess @@ -308,7 +309,7 @@ if webm_cpu_x86: else: if env["platform"] == 'windows' or env["platform"] == 'uwp': env_libvpx["ASFORMAT"] = 'win' - elif env["platform"] == 'osx': + elif env["platform"] == 'osx' or env["platform"] == "iphone": env_libvpx["ASFORMAT"] = 'macho' else: env_libvpx["ASFORMAT"] = 'elf' |