From cc95d4448c6005c3007c8460f09b8be1595eb3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 3 Nov 2016 00:23:55 +0100 Subject: scons: Reorder options for clarity Also prefix all thirdparty-related toggles with `builtin`. --- modules/webm/SCsub | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/webm') 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") -- cgit v1.2.3