summaryrefslogtreecommitdiff
path: root/modules/theora
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-28 13:29:52 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-09-28 14:07:39 +0200
commit3a2ca68af3c8bafe9f60f09bd8fece894fe3a925 (patch)
treec33aa8ccee82b26d868fbc91abed94e2480864c2 /modules/theora
parent243bdc4524ddcf8ac6bef03c378e14fe7bb263b8 (diff)
SCons: Build thirdparty code in own env, disable warnings
Also remove unnecessary `Export('env')` in other SCsubs, Export should only be used when exporting *new* objects.
Diffstat (limited to 'modules/theora')
-rw-r--r--modules/theora/SCsub5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/theora/SCsub b/modules/theora/SCsub
index 9015c2c354..98c4274a7e 100644
--- a/modules/theora/SCsub
+++ b/modules/theora/SCsub
@@ -70,7 +70,6 @@ if env['builtin_libtheora']:
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
- env_theora.add_source_files(env.modules_sources, thirdparty_sources)
env_theora.Append(CPPPATH=[thirdparty_dir])
# also requires libogg and libvorbis
@@ -79,5 +78,9 @@ if env['builtin_libtheora']:
if env['builtin_libvorbis']:
env_theora.Append(CPPPATH=["#thirdparty/libvorbis"])
+ env_thirdparty = env_theora.Clone()
+ env_thirdparty.disable_warnings()
+ env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
# Godot source files
env_theora.add_source_files(env.modules_sources, "*.cpp")