diff options
| author | Marc <marc.gilleron@gmail.com> | 2020-08-30 22:33:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 22:33:45 +0100 |
| commit | fd281da1cf5951b0f6b7bdafe88af3731f309675 (patch) | |
| tree | c103101a8d3ffd3d59a15a9da7432c832be53130 /SConstruct | |
| parent | ca800d63c8ffb0ceabc1a8e9e6e4e74435395c42 (diff) | |
| parent | db941344e32590142eadebe7d0ec362e71528ec1 (diff) | |
| download | redot-cpp-fd281da1cf5951b0f6b7bdafe88af3731f309675.tar.gz | |
Merge pull request #382 from Zylann/fix_sconstruct_default_bits
Fix default value of `bits` misnaming resulting library
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 28 |
1 files changed, 13 insertions, 15 deletions
@@ -68,6 +68,17 @@ else: '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.Add(EnumVariable( 'platform', @@ -79,8 +90,8 @@ opts.Add(EnumVariable( opts.Add(EnumVariable( 'bits', 'Target platform bits', - 'default', - ('default', '32', '64') + '64' if is64 else '32', + ('32', '64') )) opts.Add(BoolVariable( 'use_llvm', @@ -150,22 +161,9 @@ opts.Add(BoolVariable( True )) -env = Environment(ENV = os.environ) opts.Update(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 way, you can run SCons in a Visual Studio 2017 prompt and it will find # all the required tools |