From cc95d4448c6005c3007c8460f09b8be1595eb3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 3 Nov 2016 00:23:55 +0100
Subject: scons: Reorder options for clarity

Also prefix all thirdparty-related toggles with `builtin`.
---
 modules/vorbis/SCsub | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/vorbis')

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
-- 
cgit v1.2.3