Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default value of `bits` misnaming resulting library

pull/382/head
Marc Gilleron 2020-03-30 22:58:20 +01:00
parent c2f765e49c
commit db941344e3
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SConstruct
View File

@ -68,6 +68,17 @@ else:
'platform=<platform>' 'platform=<platform>'
) )
env = Environment(ENV = os.environ)
is64 = sys.maxsize > 2**32
if (
env['TARGET_ARCH'] == 'amd64' or
env['TARGET_ARCH'] == 'emt64' or
env['TARGET_ARCH'] == 'x86_64' or
env['TARGET_ARCH'] == 'arm64-v8a'
):
is64 = True
opts = Variables([], ARGUMENTS) opts = Variables([], ARGUMENTS)
opts.Add(EnumVariable( opts.Add(EnumVariable(
'platform', 'platform',
@ -79,8 +90,8 @@ opts.Add(EnumVariable(
opts.Add(EnumVariable( opts.Add(EnumVariable(
'bits', 'bits',
'Target platform bits', 'Target platform bits',
'default', '64' if is64 else '32',
('default', '32', '64') ('32', '64')
)) ))
opts.Add(BoolVariable( opts.Add(BoolVariable(
'use_llvm', 'use_llvm',
@ -145,22 +156,9 @@ opts.Add(
os.environ.get("ANDROID_NDK_ROOT", None) os.environ.get("ANDROID_NDK_ROOT", None)
) )
env = Environment(ENV = os.environ)
opts.Update(env) opts.Update(env)
Help(opts.GenerateHelpText(env)) Help(opts.GenerateHelpText(env))
is64 = sys.maxsize > 2**32
if (
env['TARGET_ARCH'] == 'amd64' or
env['TARGET_ARCH'] == 'emt64' or
env['TARGET_ARCH'] == 'x86_64' or
env['TARGET_ARCH'] == 'arm64-v8a'
):
is64 = True
if env['bits'] == 'default':
env['bits'] = '64' if is64 else '32'
# This makes sure to keep the session environment variables on Windows. # This makes sure to keep the session environment variables on Windows.
# This way, you can run SCons in a Visual Studio 2017 prompt and it will find # This way, you can run SCons in a Visual Studio 2017 prompt and it will find
# all the required tools # all the required tools