scons: Reorder options for clarity

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

7 files changed, 21 insertions, 30 deletions

diff --git a/platform/android/detect.py b/platform/android/detect.py
index 23c4470b09..7f197895f1 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -37,7 +37,6 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('openssl', 'builtin'),  # use builtin openssl
     ]
 
 
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py
index 95720794b2..d3ee9f0124 100644
--- a/platform/bb10/detect.py
+++ b/platform/bb10/detect.py
@@ -37,7 +37,6 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('builtin_zlib', 'yes'),
         ('module_theora_enabled', 'no'),
     ]
 
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 229038697c..b92b64e9f1 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -41,9 +41,6 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('webp', 'yes'),
-        ('builtin_zlib', 'yes'),
-        ('openssl', 'builtin'),  # use builtin openssl
     ]
 
 
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index ec99392987..9bc204a94a 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -31,7 +31,6 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('builtin_zlib', 'yes'),
         ('module_etc1_enabled', 'no'),
         ('module_mpc_enabled', 'no'),
         ('module_theora_enabled', 'no'),
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 0576b0bfa9..df5bc49aa4 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -180,8 +180,6 @@ def get_opts():
 def get_flags():
 
     return [
-        ('builtin_zlib', 'yes'),
-        ('openssl', 'builtin'),  # use builtin openssl
     ]
 
 
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index 2156e593e8..6a1a06d8ab 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -33,8 +33,6 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('builtin_zlib', 'yes'),
-        ('openssl', 'builtin'),
         ('xaudio2', 'yes'),
     ]
 
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 935a9fcc26..d8cd79297e 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -70,9 +70,10 @@ def get_opts():
 def get_flags():
 
     return [
-        ("openssl", "system"),
-        ('freetype', 'system'),
-        ('libpng', 'system'),
+        ('builtin_freetype', 'no'),
+        ('builtin_libpng', 'no'),
+        ('builtin_openssl', 'no'),
+        ('builtin_zlib', 'no'),
     ]
 
 
@@ -132,50 +133,50 @@ def configure(env):
     env.ParseConfig('pkg-config xcursor --cflags --libs')
     env.ParseConfig('pkg-config xrandr --cflags --libs')
 
-    if (env["openssl"] == "system"):
+    if (env['builtin_openssl'] == 'no'):
         env.ParseConfig('pkg-config openssl --cflags --libs')
 
-    if (env["libwebp"] == "system"):
+    if (env['builtin_libwebp'] == 'no'):
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
-    if (env["freetype"] == "system"):
-        env["libpng"] = "system"  # Freetype links against libpng
+    if (env['builtin_freetype'] == 'no'):
+        env['builtin_libpng'] = 'no'  # Freetype links against libpng
         env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
-    if (env["libpng"] == "system"):
+    if (env['builtin_libpng'] == 'no'):
         env.ParseConfig('pkg-config libpng --cflags --libs')
 
-    if (env["enet"] == "system"):
+    if (env['builtin_enet'] == 'no'):
         env.ParseConfig('pkg-config libenet --cflags --libs')
 
-    if (env["squish"] == "system" and env["tools"] == "yes"):
+    if (env['builtin_squish'] == 'no' and env["tools"] == "yes"):
         env.ParseConfig('pkg-config libsquish --cflags --libs')
 
     # Sound and video libraries
     # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
 
-    if (env["libtheora"] == "system"):
-        env["libogg"] = "system"  # Needed to link against system libtheora
-        env["libvorbis"] = "system"  # Needed to link against system libtheora
+    if (env['builtin_libtheora'] == 'no'):
+        env['builtin_libogg'] = 'no'  # Needed to link against system libtheora
+        env['builtin_libvorbis'] = 'no'  # Needed to link against system libtheora
         env.ParseConfig('pkg-config theora theoradec --cflags --libs')
 
-    if (env["libvpx"] == "system"):
+    if (env['builtin_libvpx'] == 'no'):
         env.ParseConfig('pkg-config vpx --cflags --libs')
 
-    if (env["libvorbis"] == "system"):
-        env["libogg"] = "system"  # Needed to link against system libvorbis
+    if (env['builtin_libvorbis'] == 'no'):
+        env['builtin_libogg'] = 'no'  # Needed to link against system libvorbis
         env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
 
-    if (env["opus"] == "system"):
-        env["libogg"] = "system"  # Needed to link against system opus
+    if (env['builtin_opus'] == 'no'):
+        env['builtin_libogg'] = 'no'  # Needed to link against system opus
         env.ParseConfig('pkg-config opus opusfile --cflags --libs')
 
-    if (env["libogg"] == "system"):
+    if (env['builtin_libogg'] == 'no'):
         env.ParseConfig('pkg-config ogg --cflags --libs')
 
     env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
 
-    if (env["glew"] == "system"):
+    if (env['builtin_glew'] == 'no'):
         env.ParseConfig('pkg-config glew --cflags --libs')
 
     if os.system("pkg-config --exists alsa") == 0: