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:
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_compile.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 5e25d9f3f04..aa643b28f8f 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -75,6 +75,13 @@ if 'cmake' in builder:
cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
elif builder.startswith('win'):
+ if builder.endswith('_vc14'):
+ if builder.startswith('win64'):
+ cmake_options.append(['-G', '"Visual Studio 14 2015 Win64"'])
+ elif builder.startswith('win32'):
+ bits = 32
+ cmake_options.append(['-G', '"Visual Studio 14 2015"'])
+ else:
if builder.startswith('win64'):
cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"'])
elif builder.startswith('win32'):