diff options
| author | Colin Kinloch | 2017-12-18 15:39:09 +0000 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-02-19 20:46:49 +0100 |
| commit | 611caa06a5d781353fd0f047cdf69f3e2932c0a6 (patch) | |
| tree | 92c4080c89cde815d66647752113166f40856c2f /modules/webm | |
| parent | 3f6e8d70cfad6a8e813808ae9c33c8fa6ce85ff0 (diff) | |
| download | godot-611caa06a5d781353fd0f047cdf69f3e2932c0a6.tar.gz godot-611caa06a5d781353fd0f047cdf69f3e2932c0a6.tar.zst godot-611caa06a5d781353fd0f047cdf69f3e2932c0a6.zip | |
Fixed android arm64v8
(cherry picked from commit 853b1daa499cf3add4014cf4d825c01603e2d1ea)
Diffstat (limited to 'modules/webm')
| -rw-r--r-- | modules/webm/libvpx/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 73ba17d18..aa282338c 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -333,7 +333,7 @@ if webm_cpu_x86: if webm_cpu_arm: if env["platform"] == 'iphone': env_libvpx["ASFLAGS"] = '-arch armv7' - elif env["platform"] == 'android' or env["platform"] == 'x11' or env["platform"] == 'server': + elif env["platform"] == 'android' and env["android_arch"] == 'armv7' or env["platform"] == 'x11' or env["platform"] == 'server': env_libvpx["ASFLAGS"] = '-mfpu=neon' elif env["platform"] == 'uwp': env_libvpx["AS"] = 'armasm' @@ -389,5 +389,5 @@ elif webm_cpu_arm: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_armasm_ms) elif env["platform"] == 'iphone': env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas_apple) - else: + elif not env["android_arch"] == 'arm64v8': env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas) |