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

Flatten GL lists in SConstruct

Browse source 
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.
This commit is contained in:
Kp 2018-02-18 18:52:22 +00:00
parent f904f76c99
commit fab7eb39c3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -3597,7 +3597,7 @@ class DXXCommon(LazyObjectConstructor):
# Base class for platform-specific settings processing # Base class for platform-specific settings processing
class _PlatformSettings: class _PlatformSettings:
tools = ('g++', 'gnulink') tools = ('g++', 'gnulink')
ogllibs = '' ogllibs = []
platform_objects = () platform_objects = ()
def __init__(self,program,user_settings): def __init__(self,program,user_settings):
self.__program = program self.__program = program
@ -3607,7 +3607,7 @@ class DXXCommon(LazyObjectConstructor):
return self.__program.env return self.__program.env
# Settings to apply to mingw32 builds # Settings to apply to mingw32 builds
class Win32PlatformSettings(_PlatformSettings): class Win32PlatformSettings(_PlatformSettings):
ogllibs = ('opengl32',) ogllibs = ['opengl32']
tools = ('mingw',) tools = ('mingw',)
def adjust_environment(self,program,env): def adjust_environment(self,program,env):
env.Append( env.Append(
@ -3642,7 +3642,7 @@ class DXXCommon(LazyObjectConstructor):
@property @property
def ogllibs(self): def ogllibs(self):
user_settings = self.user_settings 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 @staticmethod
def get_platform_objects(_empty=()): def get_platform_objects(_empty=()):
return _empty return _empty