diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-05-15 09:49:40 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-05-15 09:50:02 +0400 |
| commit | 2eeab8f1912e2214044b9aacb11acbb54d07de7b (patch) | |
| tree | 9f04d6472614703af11b1c591d2d4165ebf2c113 /build_files/buildbot | |
| parent | 7c5163829275577884c83184537c2fdd9aba92bc (diff) | |
Windows: Remove support for MSVC 2012 (VC11).
The officially supported compiled is now MSVC 2013, and MSVC 2008 will be faded out slowly over the coming weeks.
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/master.cfg | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 556eef88f81..08c96f687b4 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -161,8 +161,6 @@ add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) add_builder(c, 'win32_scons', 'windows', generic_builder, hour=1) add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2) -add_builder(c, 'win32_scons_vc2012', 'windows_vc11', generic_builder, hour=1) -add_builder(c, 'win64_scons_vc2012', 'win64_vc11', generic_builder, hour=2) #add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4) add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3) #add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 8d5d3a5eb79..67fae89a22a 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -144,8 +144,6 @@ else: scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') if builder.find('mingw') != -1: 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') @@ -166,8 +164,6 @@ else: os.makedirs(install_dir) 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') if builder.find('win64') == -1: diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 0f410eecfca..2a940f97628 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -99,8 +99,6 @@ if builder.find('scons') != -1: scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') if builder.find('mingw') != -1: 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') |