diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-02 10:48:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 10:48:30 +0100 |
| commit | 2fa5bb6be78e4f6130dceae02caf8afa5f61b578 (patch) | |
| tree | 739c806b0f30f19350531ecf22cabf2c2360e437 /platform | |
| parent | e930fb9a6e4277ad3c4dc60a775785b294840512 (diff) | |
| parent | 1807e0f1355efc92503aeb4c0a2496617d3f0872 (diff) | |
Merge pull request #26473 from akien-mga/scons-opus-fixed
SCons: Move platform-specific Opus config to its module
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 6 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 8 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 4 |
3 files changed, 0 insertions, 18 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index aa48252435..80cda68a9e 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -298,12 +298,6 @@ def configure(env): env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL']) env.Append(LIBS=['OpenSLES', 'EGL', 'GLESv3', 'android', 'log', 'z', 'dl']) - # TODO: Move that to opus module's config - if 'module_opus_enabled' in env and env['module_opus_enabled']: - if (env["android_arch"] == "armv6" or env["android_arch"] == "armv7"): - env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) - env.opus_fixed_point = "yes" - # Return NDK version string in source.properties (adapted from the Chromium project). def get_ndk_version(path): if path is None: diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index d0e6a4cefe..172572bcb4 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -174,11 +174,3 @@ def configure(env): env.Append(CPPPATH=['#platform/iphone']) env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES_ENABLED', '-DCOREAUDIO_ENABLED']) - - # TODO: Move that to opus module's config - if 'module_opus_enabled' in env and env['module_opus_enabled']: - env.opus_fixed_point = "yes" - if (env["arch"] == "arm"): - env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) - elif (env["arch"] == "arm64"): - env.Append(CFLAGS=["-DOPUS_ARM64_OPT"]) diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 3cc79097f8..47da8de5df 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -136,7 +136,3 @@ def configure(env): # TODO: Reevaluate usage of this setting now that engine.js manages engine runtime. env.Append(LINKFLAGS=['-s', 'NO_EXIT_RUNTIME=1']) - - # TODO: Move that to opus module's config. - if 'module_opus_enabled' in env and env['module_opus_enabled']: - env.opus_fixed_point = 'yes' |