From 995dcb610cd5c28bfa0007fd566a619ad512abf2 Mon Sep 17 00:00:00 2001
From: Rémi Verschelde
Date: Wed, 12 Oct 2016 20:37:38 +0200
Subject: ogg/vorbis/opus/speex: 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.
(cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681)

speex module was only added while cherry-picking, as speex is removed
in the master branch but we don't want to break compatibility in 2.1.x.
Unbundling wasn't done as the module uses the internal speex_free,
so it would require some more work.
---
 platform/javascript/detect.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'platform/javascript/detect.py')

diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 3ff299c5b..6f96aa337 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -28,7 +28,7 @@ def get_flags():
 		('theora', 'no'),
 		('musepack', 'no'),
 		('squish', 'no'),
-		('speex', 'no'),
+		('module_speex_enabled', 'no'),
 		('etc1', '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'])
-- 
cgit v1.2.3-70-g09d2