[Bf-blender-cvs] [8c4d40d] master: MSVC 2013 buildbot changes

[Martijn Berger]

Commit: 8c4d40d0e5a46128dffd842e2a2c6c4fcd59064a
Author: Martijn Berger
Date:   Sun Dec 29 17:43:31 2013 +0100
https://developer.blender.org/rB8c4d40d0e5a46128dffd842e2a2c6c4fcd59064a

MSVC 2013 buildbot changes

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index e45b4f1..2d8548c 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -145,6 +145,11 @@ else:
                 scons_options.append('BF_TOOLSET=mingw')
             if builder.endswith('vc2012'):
                 scons_options.append('MSVS_VERSION=11.0')
+            if builder.endswith('vc2013'):
+                scons_options.append('MSVS_VERSION=12.0')
+                scons_options.append('MSVC_VERSION=12.0')
+                scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1')
+                scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc')
             scons_options.append('BF_NUMJOBS=1')
 
         elif builder.find('mac') != -1:
@@ -158,7 +163,9 @@ else:
         if builder.find('win') != -1:
             if not os.path.exists(install_dir):
                 os.makedirs(install_dir)
-            if builder.endswith('vc2012'):
+            if builder.endswith('vc2013'):
+                dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll')
+            elif builder.endswith('vc2012'):
                 dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
             else:
                 dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')