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:
authorMartijn Berger <mberger@denc.nl>2015-07-26 22:14:24 +0300
committerMartijn Berger <mberger@denc.nl>2015-07-26 22:14:24 +0300
commit27a20c2c607c1437720234f57c8ff8297673b4ef (patch)
tree7e757fe8366008d8249eb9d66ef7c0c76c54d34b /build_files/buildbot/slave_compile.py
parentfb7281fb6a43629f2624cee9dae2c7ec530a8aad (diff)
Make cmake windows 32 bit buildbot use the 120xp toolkit, restoring
windows XP compatibility Fixes T45559
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
-rw-r--r--build_files/buildbot/slave_compile.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 7b3f848a198..d30241a9e5c 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -57,7 +57,10 @@ if 'cmake' in builder:
retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
if retcode != 0:
sys.exit(retcode)
- if 'win' in builder:
+
+ if 'win32' in builder:
+ retcode = subprocess.call(['msbuild', 'INSTALL.vcxproj', '/Property:PlatformToolset=v120_xp', '/p:Configuration=Release'])
+ elif 'win64' in builder:
retcode = subprocess.call(['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release'])
else:
retcode = subprocess.call(['make', '-s', '-j4', 'install'])