noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

scons: Reorder options for clarity

Browse Source 
Also prefix all thirdparty-related toggles with `builtin`.
This commit is contained in:
Rémi Verschelde
2016-11-03 00:23:55 +01:00
parent cc54189911
commit cc95d4448c
21 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webm/SCsub
+4 -4
View File
@@ -19,14 +19,14 @@ env_webm.add_source_files(env.modules_sources, thirdparty_libsimplewebm_sources)
env_webm.Append(CPPPATH=[thirdparty_libsimplewebm_dir, thirdparty_libsimplewebm_dir + "libwebm/"])
# also requires libogg, libvorbis and libopus
if (env["libogg"] != "system"): # builtin
if (env['builtin_libogg'] != 'no'):
env_webm.Append(CPPPATH=["#thirdparty/libogg"])
if (env["libvorbis"] != "system"): # builtin
if (env['builtin_libvorbis'] != 'no'):
env_webm.Append(CPPPATH=["#thirdparty/libvorbis"])
if (env["opus"] != "system"): # builtin
if (env['builtin_opus'] != 'no'):
env_webm.Append(CPPPATH=["#thirdparty"])
if (env["libvpx"] != "system"): # builtin
if (env['builtin_libvpx'] != 'no'):
Export('env_webm')
SConscript("libvpx/SCsub")