diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-12-08 07:47:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 07:47:56 +0100 |
| commit | c3886e89cb399ec828d1cf646f983da9b92a3f8a (patch) | |
| tree | 97cd9ed78c55f6ea2875d83978fd8f73312d38a7 | |
| parent | 9b1e04f79e3e46c1ce9f6db78204a126c4507ab9 (diff) | |
| parent | 86a2a423031267a98794bdbbc8024c0544604909 (diff) | |
Merge pull request #7267 from zaps166/webm-arm-fix-compilation
WebM: Fix compilation on Linux/X11 ARM platform
| -rw-r--r-- | modules/webm/libvpx/SCsub | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index a6b9e46ee8..241d6e30cd 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -263,6 +263,8 @@ if env["platform"] == 'uwp': else: webm_cpu_x86 = True else: + import platform + is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and platform.machine().startswith('arm')) 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: @@ -270,8 +272,8 @@ else: 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 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') + webm_cpu_x86 = not is_x11_or_server_arm and (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 = is_x11_or_server_arm or (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 @@ -331,7 +333,7 @@ if webm_cpu_x86: if webm_cpu_arm: if env["platform"] == 'iphone': env_libvpx["ASFLAGS"] = '-arch armv7' - elif env["platform"] == 'android': + elif env["platform"] == 'android' or env["platform"] == 'x11' or env["platform"] == 'server': env_libvpx["ASFLAGS"] = '-mfpu=neon' elif env["platform"] == 'uwp': env_libvpx["AS"] = 'armasm' |