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

Allow user to override Raspberry Pi defaults

Browse source
This commit is contained in:
Kp 2013-03-16 17:18:33 +00:00
parent a842ddca86
commit afab0f4bb8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -27,7 +27,6 @@ class DXXCommon:
__endian = checkEndian()
class UserSettings:
def __init__(self,ARGUMENTS):
self.OGLES_LIB = 'GLES_CM'
# Paths for the Videocore libs/includes on the Raspberry Pi
self.RPI_DEFAULT_VC_PATH='/opt/vc'
@ -35,8 +34,6 @@ class DXXCommon:
self.debug = int(ARGUMENTS.get('debug', 0))
self.profiler = int(ARGUMENTS.get('profiler', 0))
self.opengl = int(ARGUMENTS.get('opengl', 1))
self.opengles = int(ARGUMENTS.get('opengles', 0))
self.opengles_lib = str(ARGUMENTS.get('opengles_lib', self.OGLES_LIB))
self.asm = int(ARGUMENTS.get('asm', 0))
self.editor = int(ARGUMENTS.get('editor', 0))
self.sdlmixer = int(ARGUMENTS.get('sdlmixer', 1))
@ -46,10 +43,14 @@ class DXXCommon:
self.verbosebuild = int(ARGUMENTS.get('verbosebuild', 0))
self.raspberrypi = int(ARGUMENTS.get('raspberrypi', 0))
self.rpi_vc_path = str(ARGUMENTS.get('rpi_vc_path', self.RPI_DEFAULT_VC_PATH))
self.default_opengles = 0
self.default_OGLES_LIB = 'GLES_CM'
# automatic setup for raspberrypi
if (self.raspberrypi == 1):
self.opengles=1
self.opengles_lib='GLESv2'
self.default_opengles=1
self.default_OGLES_LIB='GLESv2'
self.opengles = int(ARGUMENTS.get('opengles', self.default_opengles))
self.opengles_lib = str(ARGUMENTS.get('opengles_lib', self.default_OGLES_LIB))
# Base class for platform-specific settings processing
class _PlatformSettings:
def __init__(self):
@ -832,7 +833,7 @@ Help('DXX-Rebirth, SConstruct file help:' +
""" +
((' d1x sharepath = ' + program_d1x.user_settings.DATA_DIR + '\n') if program_d1x else '') +
((' d2x sharepath = ' + program_d2x.user_settings.DATA_DIR + '\n') if program_d2x else '') +
((' d2x opengles_lib = ' + program_d2x.user_settings.OGLES_LIB + '\n') if program_d2x else '') +
((' d2x opengles_lib = ' + program_d2x.user_settings.default_OGLES_LIB + '\n') if program_d2x else '') +
((' d2x rpi_vc_path = ' + program_d2x.user_settings.RPI_DEFAULT_VC_PATH + '\n') if program_d2x else '') +
"""
Some influential environment variables: