TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reduce global lookups

Browse source
This commit is contained in:
Kp 2015-11-01 21:15:38 +00:00
parent bab5f5f1be
commit b35ef80a0f
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SConstruct
View file

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