Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

MSVC 2013 buildbot changes

Browse Source
This commit is contained in:
Martijn Berger
2013-12-29 17:43:31 +01:00
parent 21d587d9fc
commit 8c4d40d0e5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/buildbot/slave_compile.py
View File

@@ -145,6 +145,11 @@ else:
scons_options.append('BF_TOOLSET=mingw') scons_options.append('BF_TOOLSET=mingw')
if builder.endswith('vc2012'): if builder.endswith('vc2012'):
scons_options.append('MSVS_VERSION=11.0') 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') scons_options.append('BF_NUMJOBS=1')
elif builder.find('mac') != -1: elif builder.find('mac') != -1:
@@ -158,7 +163,9 @@ else:
if builder.find('win') != -1: if builder.find('win') != -1:
if not os.path.exists(install_dir): if not os.path.exists(install_dir):
os.makedirs(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') dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
else: else:
dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest') dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')