diff options
| author | Rémi Verschelde | 2016-10-12 20:37:38 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-15 11:50:40 +0200 |
| commit | d9a291f6411f2e571c181da0ac89f550ba73f681 (patch) | |
| tree | a560b8263d9ab896a05087eb20d5eeefdeb89969 /platform/javascript | |
| parent | ee3cf211c6fd4d1e30617467cdbbe945798a68b3 (diff) | |
| download | godot-d9a291f6411f2e571c181da0ac89f550ba73f681.tar.gz godot-d9a291f6411f2e571c181da0ac89f550ba73f681.tar.zst godot-d9a291f6411f2e571c181da0ac89f550ba73f681.zip | |
ogg/vorbis/opus: Make them modules and unbundle thirdparty libs
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.
TODO: Fix the platform/ stuff for opus.
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/detect.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0f1fd2317..f80c3b491 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -70,8 +70,9 @@ def configure(env): #env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED']) env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC']) - if(env["opus"]=="yes"): - env.opus_fixed_point="yes" + # TODO: Move that to opus module's config + if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"): + env.opus_fixed_point = "yes" env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti']) env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS']) |