From fab7eb39c32be298f410b7fdfde8c5547175d725 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 18 Feb 2018 18:52:22 +0000 Subject: [PATCH] Flatten GL lists in SConstruct This is a longstanding cosmetic issue. Appending a tuple to a list retains the tuple structure, which is then printed later. Append it as a list so that it is flattened. --- SConstruct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 4a96ead04..f47e2ed38 100644 --- a/SConstruct +++ b/SConstruct @@ -3597,7 +3597,7 @@ class DXXCommon(LazyObjectConstructor): # Base class for platform-specific settings processing class _PlatformSettings: tools = ('g++', 'gnulink') - ogllibs = '' + ogllibs = [] platform_objects = () def __init__(self,program,user_settings): self.__program = program @@ -3607,7 +3607,7 @@ class DXXCommon(LazyObjectConstructor): return self.__program.env # Settings to apply to mingw32 builds class Win32PlatformSettings(_PlatformSettings): - ogllibs = ('opengl32',) + ogllibs = ['opengl32'] tools = ('mingw',) def adjust_environment(self,program,env): env.Append( @@ -3642,7 +3642,7 @@ class DXXCommon(LazyObjectConstructor): @property def ogllibs(self): user_settings = self.user_settings - return (user_settings.opengles_lib, user_settings.egl_lib) if user_settings.opengles else ('GL', 'GLU') + return [user_settings.opengles_lib, user_settings.egl_lib] if user_settings.opengles else ['GL', 'GLU'] @staticmethod def get_platform_objects(_empty=()): return _empty