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

Make host_platform msys an alias for win32

Browse source 
User jammer1 reports that Python under MSYS2[1] reports a `sys.platform`
of `msys`.  For the limited purposes Rebirth requires, this platform can
be treated as if it were `win32`.  Add a mapping to apply this change
automatically, so that users do not need to set it on the command line.

Reported-by: jammer1 <https://github.com/dxx-rebirth/dxx-rebirth/issues/405>

[1]: http://www.msys2.org/
This commit is contained in:
Kp 2018-09-11 01:10:57 +00:00
parent 38d5bd6b86
commit 45ee65bc7e
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -3460,6 +3460,11 @@ class DXXCommon(LazyObjectConstructor):
tests = __get_configure_tests(conftests)
expect_sconf_tuple = ('0', '1', conftests.expect_sconf_success, conftests.expect_sconf_failure)
sconf_tuple = ('0', '1', '2', conftests.sconf_force_failure, conftests.sconf_force_success, conftests.sconf_assume_success)
sys_platform = sys.platform
if sys_platform.startswith('linux'):
sys_platform = 'linux'
elif sys_platform.startswith('openbsd'):
sys_platform = 'openbsd'
return (
{
'variable': EnumVariable,
@ -3484,6 +3489,14 @@ class DXXCommon(LazyObjectConstructor):
{
'variable': EnumVariable,
'arguments': (
('host_platform',
sys_platform,
'cross-compile to specified platform',
{
'map': {'msys2':'win32'},
'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32'),
}
),
('raspberrypi', None, 'build for Raspberry Pi (automatically selects opengles)', {'ignorecase': 2, 'map': {'1':'yes', 'true':'yes', '0':'no', 'false':'no'}, 'allowed_values': ('yes', 'no', 'mesa')}),
),
},
@ -3590,7 +3603,6 @@ class DXXCommon(LazyObjectConstructor):
'variable': EnumVariable,
'arguments': (
('host_endian', None, 'endianness of host platform', {'allowed_values' : ('little', 'big')}),
('host_platform', sys.platform.rstrip('0123456789'), 'cross-compile to specified platform', {'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32')}),
('screenshot', 'png', 'screenshot file format', {'allowed_values' : ('none', 'legacy', 'png')}),
),
},