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/theora/SCsub | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/theora/SCsub') diff --git a/modules/theora/SCsub b/modules/theora/SCsub index ff34b85879..2de4d29640 100644 --- a/modules/theora/SCsub +++ b/modules/theora/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_theora = env_modules.Clone() # Thirdparty source files -if (env["libtheora"] != "system"): # builtin +if (env['builtin_libtheora'] != 'no'): thirdparty_dir = "#thirdparty/libtheora/" thirdparty_sources = [ #"analyze.c", @@ -74,9 +74,9 @@ if (env["libtheora"] != "system"): # builtin env_theora.Append(CPPPATH=[thirdparty_dir]) # also requires libogg and libvorbis - if (env["libogg"] != "system"): # builtin + if (env['builtin_libogg'] != 'no'): env_theora.Append(CPPPATH=["#thirdparty/libogg"]) - if (env["libvorbis"] != "system"): # builtin + if (env['builtin_libvorbis'] != 'no'): env_theora.Append(CPPPATH=["#thirdparty/libvorbis"]) # Godot source files -- cgit v1.2.3