diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-16 11:52:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 11:52:09 +0200 |
| commit | 89132224a651c0e0d4121270f63decb9a678ff88 (patch) | |
| tree | 224a008705391b6e5b560d2c0426380651756383 /platform/javascript/detect.py | |
| parent | eb8d19ba740c11acf0f26080405fc5cd827a2d41 (diff) | |
| parent | e57042e8a93e4f3d65cc91633f5af0daedf69a2a (diff) | |
Merge pull request #6830 from akien-mga/thirdparty
Move most "drivers" as toggleable "modules" and split their thirdparty libraries in an own tree
Diffstat (limited to 'platform/javascript/detect.py')
| -rw-r--r-- | platform/javascript/detect.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0f1fd23177..e1f91cf948 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,10 +26,10 @@ def get_flags(): return [ ('tools', 'no'), - ('theora', 'no'), - ('musepack', 'no'), - ('squish', 'no'), - ('etc1', 'no'), + ('builtin_zlib', 'yes'), + ('module_etc1_enabled', 'no'), + ('module_mpc_enabled', 'no'), + ('module_theora_enabled', 'no'), ] @@ -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']) |