scons: Reorder options for clarity

Also prefix all thirdparty-related toggles with `builtin`.

11 files changed, 19 insertions, 19 deletions

diff --git a/modules/enet/SCsub b/modules/enet/SCsub
index 8188107603..fb22d1cff0 100644
--- a/modules/enet/SCsub
+++ b/modules/enet/SCsub
@@ -7,7 +7,7 @@ Import('env_modules')
 
 env_enet = env_modules.Clone()
 
-if (env["enet"] != "system"):  # builtin
+if (env['builtin_enet'] != 'no'):
     thirdparty_dir = "#thirdparty/enet/"
     thirdparty_sources = [
         "callbacks.c",
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
index c68c40265c..87652a3ddf 100644
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -5,7 +5,7 @@ Import('env')
 # Not building in a separate env as core needs it
 
 # Thirdparty source files
-if (env["freetype"] != "system"):  # builtin
+if (env['builtin_freetype'] != 'no'):
     thirdparty_dir = "#thirdparty/freetype/"
     thirdparty_sources = [
         "src/autofit/autofit.c",
@@ -61,7 +61,7 @@ if (env["freetype"] != "system"):  # builtin
     env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 
     # also requires libpng headers
-    if (env["libpng"] != "system"):  # builtin
+    if (env['builtin_libpng'] != 'no'):
         env.Append(CPPPATH=["#thirdparty/libpng"])
 
     """ FIXME: Remove this commented code if Windows can handle the monolithic lib
diff --git a/modules/mpc/SCsub b/modules/mpc/SCsub
index 80d2ab4abe..76b7cbea7a 100644
--- a/modules/mpc/SCsub
+++ b/modules/mpc/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_mpc = env_modules.Clone()
 
 # Thirdparty source files
-if (env["libmpcdec"] != "system"):  # builtin
+if (env['builtin_libmpcdec'] != 'no'):
     thirdparty_dir = "#thirdparty/libmpcdec/"
     thirdparty_sources = [
         "huffman.c",
diff --git a/modules/ogg/SCsub b/modules/ogg/SCsub
index 719ee4662b..5eabaf6f2b 100644
--- a/modules/ogg/SCsub
+++ b/modules/ogg/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_ogg = env_modules.Clone()
 
 # Thirdparty source files
-if (env["libogg"] != "system"):  # builtin
+if (env['builtin_libogg'] != 'no'):
     thirdparty_dir = "#thirdparty/libogg/"
     thirdparty_sources = [
         "bitwise.c",
diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub
index bac80fb76e..ccd90d1534 100644
--- a/modules/openssl/SCsub
+++ b/modules/openssl/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_openssl = env_modules.Clone()
 
 # Thirdparty source files
-if (env["openssl"] != "system"):  # builtin
+if (env['builtin_openssl'] != 'no'):
     thirdparty_dir = "#thirdparty/openssl/"
 
     thirdparty_sources = [
diff --git a/modules/opus/SCsub b/modules/opus/SCsub
index e116fc4607..491380c826 100644
--- a/modules/opus/SCsub
+++ b/modules/opus/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_opus = env_modules.Clone()
 
 # Thirdparty source files
-if (env["opus"] != "system"):  # builtin
+if (env['builtin_opus'] != 'no'):
     thirdparty_dir = "#thirdparty/opus/"
 
     thirdparty_sources = [
@@ -208,7 +208,7 @@ if (env["opus"] != "system"):  # builtin
     env_opus.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths])
 
     # also requires libogg
-    if (env["libogg"] != "system"):  # builtin
+    if (env['builtin_libogg'] != 'no'):
         env_opus.Append(CPPPATH=["#thirdparty/libogg"])
 
 # Module files
diff --git a/modules/squish/SCsub b/modules/squish/SCsub
index 462b6a05cf..cca7c038f1 100644
--- a/modules/squish/SCsub
+++ b/modules/squish/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_squish = env_modules.Clone()
 
 # Thirdparty source files
-if (env["squish"] != "system"):  # builtin
+if (env['builtin_squish'] != 'no'):
     thirdparty_dir = "#thirdparty/squish/"
     thirdparty_sources = [
         "alpha.cpp",
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
diff --git a/modules/vorbis/SCsub b/modules/vorbis/SCsub
index 3bd092105e..d3e4f7e15a 100644
--- a/modules/vorbis/SCsub
+++ b/modules/vorbis/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_vorbis = env_modules.Clone()
 
 # Thirdparty source files
-if (env["libvorbis"] != "system"):  # builtin
+if (env['builtin_libvorbis'] != 'no'):
     thirdparty_dir = "#thirdparty/libvorbis/"
     thirdparty_sources = [
         #"analysis.c",
@@ -42,7 +42,7 @@ if (env["libvorbis"] != "system"):  # builtin
     env_vorbis.Append(CPPPATH=[thirdparty_dir])
 
     # also requires libogg
-    if (env["libogg"] != "system"):  # builtin
+    if (env['builtin_libogg'] != 'no'):
         env_vorbis.Append(CPPPATH=["#thirdparty/libogg"])
 
 # Godot source files
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")
 
diff --git a/modules/webp/SCsub b/modules/webp/SCsub
index ab60bfd6b2..92f34c4da1 100644
--- a/modules/webp/SCsub
+++ b/modules/webp/SCsub
@@ -6,7 +6,7 @@ Import('env_modules')
 env_webp = env_modules.Clone()
 
 # Thirdparty source files
-if (env["libwebp"] != "system"):  # builtin
+if (env['builtin_libwebp'] != 'no'):
     thirdparty_dir = "#thirdparty/libwebp/"
     thirdparty_sources = [
         "enc/webpenc.c",