From b35ef80a0f1a7ea6c4d2a795a68e8b1cda763c85 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 1 Nov 2015 21:15:38 +0000
Subject: [PATCH] Reduce global lookups

---
 SConstruct | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index e137fcc89..ce6863fe6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2349,9 +2349,6 @@ class DXXCommon(LazyObjectConstructor):
 			return self.default_OGLES_LIB
 		def __default_DATA_DIR(self):
 			return '%s/share/games/%s' % (self.prefix, self._program.target)
-		BoolVariable = staticmethod(BoolVariable)
-		EnumVariable = staticmethod(EnumVariable)
-		@staticmethod
 		def _generic_variable(key,help,default):
 			return (key, help, default)
 		@staticmethod
@@ -2373,13 +2370,14 @@ class DXXCommon(LazyObjectConstructor):
 				# is acceptable here.
 				cls.__has_git_dir = r = os.path.exists(os.environ.get('GIT_DIR', '.git'))
 			return r
-		def _options(self):
-			EnumVariable = self.EnumVariable
-			BoolVariable = self.BoolVariable
-			generic_variable = self._generic_variable
-			conftests = ConfigureTests
+		def _options(self,
+				generic_variable=_generic_variable,
+				BoolVariable=BoolVariable,
+				EnumVariable=EnumVariable,
+				conftests=ConfigureTests,
+				getenv=os.environ.get
+			):
 			tests = self.__get_configure_tests(conftests)
-			getenv = os.environ.get
 			return (
 			{
 				'variable': EnumVariable,
@@ -2502,6 +2500,7 @@ class DXXCommon(LazyObjectConstructor):
 				),
 			},
 		)
+		_generic_variable = staticmethod(_generic_variable)
 		@staticmethod
 		def _names(name,prefix):
 			return ['%s%s%s' % (p, '_' if p else '', name) for p in prefix]