From e7c65dbc3f7d01e447198c7a530b7da50559098f Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 27 Oct 2015 03:04:49 +0000 Subject: [PATCH] Use property for LinuxPlatformSettings ogllibs It is only called once per instance, so caching it as an instance value is not helpful. Change it to a property so that __init__ can be removed. --- SConstruct | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 2ef54208a..fdebbb0f9 100644 --- a/SConstruct +++ b/SConstruct @@ -2623,12 +2623,13 @@ class DXXCommon(LazyObjectConstructor): env.Append(FRAMEWORKPATH = [os.path.join(os.getenv("HOME"), 'Library/Frameworks'), '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks']) # Settings to apply to Linux builds class LinuxPlatformSettings(_PlatformSettings): - def __init__(self,program,user_settings): - DXXCommon._PlatformSettings.__init__(self,program,user_settings) - self.ogllibs = (user_settings.opengles_lib, 'EGL') if user_settings.opengles else ('GL', 'GLU') + @property + def ogllibs(self): + user_settings = self.user_settings + return (user_settings.opengles_lib, 'EGL') if user_settings.opengles else ('GL', 'GLU') def adjust_environment(self,program,env): env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL']) - env.Append(CCFLAGS = ['-pthread']) + env.Append(CXXFLAGS = ['-pthread']) def __init__(self): LazyObjectConstructor.__init__(self)