Commit: 27a20c2c607c1437720234f57c8ff8297673b4ef
Author: Martijn Berger
Date: Sun Jul 26 21:14:24 2015 +0200
Branches: master
https://developer.blender.org/rB27a20c2c607c1437720234f57c8ff8297673b4ef
Make cmake windows 32 bit buildbot use the 120xp toolkit, restoring
windows XP compatibility
Fixes T45559
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index 7b3f848..d30241a 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'])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
