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

Merge pull request #192 from marcelofg55/win32_fix 

Fix Windows 32 bits builds producing 64 bits code
nativescript-1.0
Thomas Herzog 2018-10-26 08:51:52 +02:00 committed by GitHub
parent f52cc4c964 13f4f0e8f8
commit 1729360e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SConstruct
View File

@ -33,6 +33,15 @@ env = Environment()
opts.Update(env) opts.Update(env)
Help(opts.GenerateHelpText(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 is64 = sys.maxsize > 2**32
if env['bits'] == 'default': if env['bits'] == 'default':
env['bits'] = '64' if is64 else '32' env['bits'] = '64' if is64 else '32'
@ -69,15 +78,6 @@ elif env['platform'] == 'osx':
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=['-O3'])
elif env['platform'] == 'windows': 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']: if host_platform == 'windows' and not env['use_mingw']:
# MSVC # MSVC
env.Append(LINKFLAGS=['/WX']) env.Append(LINKFLAGS=['/WX'])