Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCons: Move platform-specific Opus config to its module #26473

Merged
merged 1 commit into from
Mar 2, 2019

Conversation

akien-mga
Copy link
Member

Finally fixing this old "TODO".

It's still far from perfect, we enable ARM-specific optimizations but we don't compile the ARM-specific code provided in the thirdparty repo.
But since Opus is on life support and only used by the Webm module, I don't want to spend too much effort on it. We should probably consider dropping it (and thus dropping Opus support in Webm), or find a way to address #7496 and re-enable Opus support as AudioStream.

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"]):
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"):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only actual logic change is here: now we're also enabling OPUS_ARM64_OPT on arm64v8 for Android. Previously it has been left out.

@akien-mga akien-mga merged commit 2fa5bb6 into godotengine:master Mar 2, 2019
@akien-mga akien-mga deleted the scons-opus-fixed branch March 2, 2019 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant