summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-12-04 15:10:33 +0100
committerGitHub <noreply@github.com>2018-12-04 15:10:33 +0100
commit9a8569d434107e721f5c7de0bf8ffe6471367d28 (patch)
tree768feb13a0eef4fd3e707d2dff4ecbb1d2f6268e /platform
parente4ebe3db26588ecac670296069770a1c6dec7dc4 (diff)
parenta99e90b258dfe53b23e3c793c93dfc2659dd4d0b (diff)
Merge pull request #24155 from akien-mga/scons-msvc-bits
SCons: Properly set bits variable as string for MSVC detection
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/detect.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index dd0042668f..e14db9a201 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -147,9 +147,9 @@ def setup_msvc_auto(env):
# Note: actual compiler version can be found in env['MSVC_VERSION'], e.g. "14.1" for VS2015
# Get actual target arch into bits (it may be "default" at this point):
if env['TARGET_ARCH'] in ('amd64', 'x86_64'):
- env['bits'] = 64
+ env['bits'] = '64'
else:
- env['bits'] = 32
+ env['bits'] = '32'
print(" Found MSVC version %s, arch %s, bits=%s" % (env['MSVC_VERSION'], env['TARGET_ARCH'], env['bits']))
if env['TARGET_ARCH'] in ('amd64', 'x86_64'):
env["x86_libtheora_opt_vc"] = False