Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2013-06-17 00:34:29 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2013-06-17 00:34:29 +0400
commitf351bcca1708c12da72097e590c578447cd51e98 (patch)
tree644ff1fa602464f19ebec96674c1b74a5db81e72 /SConstruct
parent8e5cd99e0b9b1b19f8b24100ca0f5b886069b780 (diff)
Since upgrade to SCons 2.3.0 a small change is needed to ensure 32bit is targeted properly when
building 32bit Blender with 64bit compiler installed as well (MSVC).
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 94acdbbab92..306a783b53c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -148,9 +148,9 @@ if toolset:
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
else:
- env = BlenderEnvironment(ENV = os.environ)
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
if not env:
print "Could not create a build environment"