[Bf-blender-cvs] [07e8096] master: Promote MSVC 2013 to be the official platform (without a numbered suffix) for scons

[Martijn Berger]

Commit: 07e8096c63a35af3331aae7781643ca103dd1bdf
Author: Martijn Berger
Date:   Sun May 18 15:36:46 2014 +0200
https://developer.blender.org/rB07e8096c63a35af3331aae7781643ca103dd1bdf

Promote MSVC 2013 to be the official platform (without a numbered suffix) for scons

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

M	build_files/scons/config/win32-vc-config.py
M	build_files/scons/config/win64-vc-config.py
M	build_files/scons/tools/btools.py

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

diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 876ea08..524446d 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -255,8 +255,8 @@ BF_BSC=False
 
 if VC_VERSION == '12.0':
     BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
-    BF_BUILDDIR = '..\\build\\win32-vc12'
-    BF_INSTALLDIR='..\\install\\win32-vc12'
-else:
     BF_BUILDDIR = '..\\build\\win32-vc'
     BF_INSTALLDIR='..\\install\\win32-vc'
+else:
+    BF_BUILDDIR = '..\\build\\win32-vc9'
+    BF_INSTALLDIR='..\\install\\win32-vc9'
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index e09aadf..a45c0b1 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -256,8 +256,8 @@ LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32',
 PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
 if VC_VERSION == '12.0':
     BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
-    BF_BUILDDIR = '..\\build\\win64-vc12'
-    BF_INSTALLDIR='..\\install\\win64-vc12'
-else:
     BF_BUILDDIR = '..\\build\\win64-vc'
     BF_INSTALLDIR='..\\install\\win64-vc'
+else:
+    BF_BUILDDIR = '..\\build\\win64-vc9'
+    BF_INSTALLDIR='..\\install\\win64-vc9'
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 6b0ce4e..64c56f0 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -680,8 +680,8 @@ def buildslave(target=None, source=None, env=None):
     if platform == 'darwin':
         platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
 
-    if env['MSVC_VERSION'] == '12.0':
-        platform = env['OURPLATFORM'] + '12'
+    if env['MSVC_VERSION'] == '9.0':
+        platform = env['OURPLATFORM'] + '9'
 
     branch = env['BUILDBOT_BRANCH']