From d3d0507c053a7dd20d64a1cf73740c1f66493b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 13 Oct 2016 18:58:56 +0200 Subject: Remove speex support, it is obsoleted by opus As mentioned by upstream, Xiph.Org [0]: > The Speex codec has been obsoleted by Opus. It will continue to be > available, but since Opus is better than Speex in all aspects, > users are encouraged to switch. [0] http://www.speex.org/ --- platform/javascript/detect.py | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index aeff5a1a34..0d4f0b00e5 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -34,7 +34,6 @@ def get_flags(): ('musepack', 'no'), ('squirrel', 'no'), ('squish', 'no'), - ('speex', 'no'), ('old_scenes', 'no'), ('etc1', 'no'), # ('default_gui_theme', 'no'), -- cgit v1.2.3 From f63bf12193deaf9cae5b1d6c7289afc17a7de946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 14 Oct 2016 18:21:23 +0200 Subject: Drop nedmalloc which is apparently not used anymore --- platform/javascript/detect.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0d4f0b00e5..0f1fd23177 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -25,20 +25,11 @@ def get_opts(): def get_flags(): return [ - ('lua', 'no'), ('tools', 'no'), - ('nedmalloc', 'no'), ('theora', 'no'), - ('tools', 'no'), - ('nedmalloc', 'no'), ('musepack', 'no'), - ('squirrel', 'no'), ('squish', 'no'), - ('old_scenes', 'no'), ('etc1', 'no'), -# ('default_gui_theme', 'no'), - - #('builtin_zlib', 'no'), ] -- cgit v1.2.3 From d9a291f6411f2e571c181da0ac89f550ba73f681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 12 Oct 2016 20:37:38 +0200 Subject: 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. --- platform/javascript/detect.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0f1fd23177..f80c3b4915 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']) -- cgit v1.2.3 From cfcc8a20e862b758c32bd3f152186e6df0591a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 13 Oct 2016 19:40:40 +0200 Subject: theora: Move to a module and split thirdparty lib Same rationale as the previous commits. --- platform/javascript/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index f80c3b4915..fce680b002 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'), + ('module_theora_enabled', 'no'), ] -- cgit v1.2.3 From 5c12c9e69b85023934dc85f3aada03da150556be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 13 Oct 2016 20:46:42 +0200 Subject: mpc: Move to a module and split thirdparty libmpcdec --- platform/javascript/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index fce680b002..fce57acc3b 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,9 +26,9 @@ def get_flags(): return [ ('tools', 'no'), - ('musepack', 'no'), ('squish', 'no'), ('etc1', 'no'), + ('module_mpc_enabled', 'no'), ('module_theora_enabled', 'no'), ] -- cgit v1.2.3 From 8311a78df5cdf257297c1ec7493cb098dc76f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 13 Oct 2016 21:48:06 +0200 Subject: squish: Move to a module and split thirdparty lib --- platform/javascript/detect.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index fce57acc3b..19427eff14 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,8 +26,7 @@ def get_flags(): return [ ('tools', 'no'), - ('squish', 'no'), - ('etc1', 'no'), + ('module_etc1_enabled', 'no'), ('module_mpc_enabled', 'no'), ('module_theora_enabled', 'no'), ] -- cgit v1.2.3 From cbf52606f4928df46fc89d37d781bad782f0616e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 14 Oct 2016 18:58:24 +0200 Subject: zlib: Split thirdparty files, simplify scons option --- platform/javascript/detect.py | 1 + 1 file changed, 1 insertion(+) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 19427eff14..e1f91cf948 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,6 +26,7 @@ def get_flags(): return [ ('tools', 'no'), + ('builtin_zlib', 'yes'), ('module_etc1_enabled', 'no'), ('module_mpc_enabled', 'no'), ('module_theora_enabled', 'no'), -- cgit v1.2.3