summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-10-13 19:40:40 +0200
committerRémi Verschelde <rverschelde@gmail.com>2016-10-15 11:50:41 +0200
commitcfcc8a20e862b758c32bd3f152186e6df0591a24 (patch)
treee9cf6ebad67c17ae60b8beb4d1468cbc94dbb982 /SConstruct
parentda09c6131bcdace7e8e62c3dabc62890e9564c97 (diff)
downloadredot-engine-cfcc8a20e862b758c32bd3f152186e6df0591a24.tar.gz
theora: Move to a module and split thirdparty lib
Same rationale as the previous commits.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct10
1 files changed, 1 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct
index e52e224de7..4ed3845f97 100644
--- a/SConstruct
+++ b/SConstruct
@@ -121,11 +121,10 @@ opts.Add('tools','Build Tools (Including Editor): (yes/no)','yes')
opts.Add('gdscript','Build GDSCript support: (yes/no)','yes')
opts.Add('libogg','Ogg library for ogg container support (system/builtin)','builtin')
opts.Add('libvorbis','Ogg Vorbis library for vorbis support (system/builtin)','builtin')
+opts.Add('libtheora','Theora library for theora module (system/builtin)','builtin')
opts.Add('opus','Opus and opusfile library for Opus format support: (system/builtin)','builtin')
opts.Add('minizip','Build Minizip Archive Support: (yes/no)','yes')
opts.Add('squish','Squish BC Texture Compression in editor (yes/no)','yes')
-opts.Add('theora','Theora Video (yes/no)','yes')
-opts.Add('theoralib','Theora Video (yes/no)','no')
opts.Add('freetype','Freetype support in editor','builtin')
opts.Add('xml','XML Save/Load support (yes/no)','yes')
opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin')
@@ -331,13 +330,6 @@ if selected_platform in platform_list:
if (env_base['squish']=='yes'):
env.Append(CPPFLAGS=['-DSQUISH_ENABLED']);
-
- if (env['theora']=='yes'):
- env['theoralib']='yes'
- env.Append(CPPFLAGS=['-DTHEORA_ENABLED']);
- if (env['theoralib']=='yes'):
- env.Append(CPPFLAGS=['-DTHEORALIB_ENABLED']);
-
if (env['tools']=='yes'):
env.Append(CPPFLAGS=['-DTOOLS_ENABLED'])
if (env['disable_3d']=='yes'):