[Bf-blender-cvs] [85398de] master: make MSVC plaformsuffix check much stricter. For some reason MSVC_VERSION is set

Martijn Berger noreply at git.blender.org
Mon May 19 19:22:55 CEST 2014


Commit: 85398dea500efd09f18cbbc7d96288737ec5228e
Author: Martijn Berger
Date:   Mon May 19 19:21:25 2014 +0200
https://developer.blender.org/rB85398dea500efd09f18cbbc7d96288737ec5228e

make MSVC plaformsuffix check much stricter. For some reason MSVC_VERSION is set

===================================================================

M	build_files/scons/tools/btools.py

===================================================================

diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 64c56f0..c021cc8 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -664,6 +664,9 @@ def buildslave(target=None, source=None, env=None):
     else:
         platform = env['OURPLATFORM'].split('-')[0]
 
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '9.0':
+        platform = platform + '9'
+
     if platform == 'linux':
         import platform
 
@@ -680,8 +683,6 @@ def buildslave(target=None, source=None, env=None):
     if platform == 'darwin':
         platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
 
-    if env['MSVC_VERSION'] == '9.0':
-        platform = env['OURPLATFORM'] + '9'
 
     branch = env['BUILDBOT_BRANCH']




More information about the Bf-blender-cvs mailing list