diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 00:23:55 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 07:45:08 +0100 |
commit | cc95d4448c6005c3007c8460f09b8be1595eb3c0 (patch) | |
tree | 91d5e77f5ee1eb3883b1d03e683286bb12948c31 /modules/webm | |
parent | cc54189911e47ef1d432521df7d976b818123b1e (diff) |
scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.
Diffstat (limited to 'modules/webm')
-rw-r--r-- | modules/webm/SCsub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/webm/SCsub b/modules/webm/SCsub index c4a707b8e0..e417fc0cbf 100644 --- a/modules/webm/SCsub +++ b/modules/webm/SCsub @@ -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") |