diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-29 20:43:31 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2013-12-29 20:43:31 +0400 |
| commit | 8c4d40d0e5a46128dffd842e2a2c6c4fcd59064a (patch) | |
| tree | dd8aeadc453056603519e93fd252d86b22c6a829 /build_files | |
| parent | 21d587d9fc055f568f7e0a81b58d703de7a2a1af (diff) | |
MSVC 2013 buildbot changes
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index e45b4f1971f..2d8548cbba0 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') |