From 13f4f0e8f8c8ce7472f6b55026fa0b81c1fe5bf5 Mon Sep 17 00:00:00 2001 From: Marcelo Fernandez Date: Thu, 25 Oct 2018 13:35:33 -0300 Subject: [PATCH] Fix Windows 32 bits builds producing 64 bits code --- SConstruct | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index 38ffdb53..6d8f7b9b 100644 --- a/SConstruct +++ b/SConstruct @@ -33,6 +33,15 @@ env = Environment() opts.Update(env) Help(opts.GenerateHelpText(env)) +# 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 +if env['platform'] == 'windows': + if env['bits'] == '64': + env = Environment(TARGET_ARCH='amd64') + elif env['bits'] == '32': + env = Environment(TARGET_ARCH='x86') + opts.Update(env) + is64 = sys.maxsize > 2**32 if env['bits'] == 'default': env['bits'] = '64' if is64 else '32' @@ -69,15 +78,6 @@ elif env['platform'] == 'osx': env.Append(CCFLAGS=['-O3']) elif env['platform'] == '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 all the required tools - if env['bits'] == '64': - env.Override(os.environ) - env.Append(TARGET_ARCH='amd64') - elif env['bits'] == '32': - env.Override(os.environ) - env.Append(TARGET_ARCH='x86') - if host_platform == 'windows' and not env['use_mingw']: # MSVC env.Append(LINKFLAGS=['/WX'])