diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-04 12:36:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 12:36:52 +0200 |
| commit | 2ce022af7eb6721b94d62683b285eba4dfed83a0 (patch) | |
| tree | 666cb1c53a0bcc1b746e091100ff741745ed5a4c | |
| parent | c2c11fc063e723c41579e6307e40fd16ac5334c4 (diff) | |
| parent | c2fb1c9f013a340d55d7d20cd499e4536caa23b7 (diff) | |
Merge pull request #27671 from akien-mga/scons-opus-arm
SCons: Fix OPUS_ARM_OPT flag applied for all android/iphone arches
| -rw-r--r-- | modules/opus/SCsub | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/opus/SCsub b/modules/opus/SCsub index aa656c575a..b72144c679 100644 --- a/modules/opus/SCsub +++ b/modules/opus/SCsub @@ -220,10 +220,15 @@ if env['builtin_opus']: ] env_opus.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) - if env["platform"] == "android" or env["platform"] == "iphone": - if ("arch" in env and env["arch"] == "arm") or ("android_arch" in env and env["android_arch"] in ["armv6", "armv7"]): + if env["platform"] == "android": + if ("android_arch" in env and env["android_arch"] in ["armv6", "armv7"]): env_opus.Append(CFLAGS=["-DOPUS_ARM_OPT"]) - elif ("arch" in env and env["arch"] == "arm64") or ("android_arch" in env and env["android_arch"] == "arm64v8"): + elif ("android_arch" in env and env["android_arch"] == "arm64v8"): + env_opus.Append(CFLAGS=["-DOPUS_ARM64_OPT"]) + elif env["platform"] == "iphone": + if ("arch" in env and env["arch"] == "arm"): + env_opus.Append(CFLAGS=["-DOPUS_ARM_OPT"]) + elif ("arch" in env and env["arch"] == "arm64"): env_opus.Append(CFLAGS=["-DOPUS_ARM64_OPT"]) env_thirdparty = env_opus.Clone() |