Windows: Remove support for MSVC 2012 (VC11).
authorThomas Dinges <blender@dingto.org>
Thu, 15 May 2014 05:49:40 +0000 (07:49 +0200)
committerThomas Dinges <blender@dingto.org>
Thu, 15 May 2014 05:50:02 +0000 (07:50 +0200)
The officially supported compiled is now MSVC 2013, and MSVC 2008 will be faded out slowly over the coming weeks.

CMakeLists.txt
build_files/buildbot/master.cfg
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/btools.py

index dafcf15141c89f2b523cc8592f059ddf1d5973f8..dd580fb531afb42b512485d788129ecbd99ed1c5 100644 (file)
@@ -960,11 +960,6 @@ elseif(WIN32)
 
                set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
 
-               # MSVC11 SDL is not hard linked to dxguid.lib
-               if(MSVC11 AND WITH_SDL)
-                       set(PLATFORM_LINKLIBS ${PLATFORM_LINKLIBS} dxguid)
-               endif()
-
                add_definitions(
                        -D_CRT_NONSTDC_NO_DEPRECATE
                        -D_CRT_SECURE_NO_DEPRECATE
@@ -1053,9 +1048,6 @@ elseif(WIN32)
                        if(MSVC12)
                                message(STATUS "Visual C++ 2013 detected.")
                                set(LIBDIR ${LIBDIR_BASE}_vc12)
-                       elseif(MSVC11)
-                               message(STATUS "Visual C++ 2012 detected.")
-                               set(LIBDIR ${LIBDIR_BASE}_vc11)
                        else()
                                set(LIBDIR ${LIBDIR_BASE})
                        endif()
@@ -1148,14 +1140,8 @@ elseif(WIN32)
                        find_package(FFMPEG)
                        if(NOT FFMPEG_FOUND)
                                message(WARNING "Using HARDCODED ffmpeg locations")
-                               # MSVC11 FFMPEG libs are newer
-                               if(MSVC11)
-                                       set(FFMPEG_LIBRARY_VERSION 54)
-                                       set(FFMPEG_LIBRARY_VERSION_AVU 52)
-                               else()
-                                       set(FFMPEG_LIBRARY_VERSION 55)
-                                       set(FFMPEG_LIBRARY_VERSION_AVU 52)
-                               endif()
+                               set(FFMPEG_LIBRARY_VERSION 55)
+                               set(FFMPEG_LIBRARY_VERSION_AVU 52)
                                set(FFMPEG_LIBRARIES
                                        ${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib
                                        ${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib
@@ -1236,10 +1222,6 @@ elseif(WIN32)
                                        set(BOOST_LIBPATH ${BOOST}/lib)
                                        set(BOOST_POSTFIX "vc120-mt-s-1_55.lib")
                                        set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_55.lib")
-                               elseif(MSVC11)
-                                       set(BOOST_LIBPATH ${BOOST}/lib)
-                                       set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
-                                       set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
                                else()
                                        set(BOOST_LIBPATH ${BOOST}/lib)
                                        set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
index 556eef88f811041d94560629186696363dd9300e..08c96f687b408f6178f49c905503191cc59475cc 100644 (file)
@@ -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)
index 8d5d3a5eb7909988fc2c406db40220ac9d157047..67fae89a22a46d901ae0e4b0c42a3b8e27eaf1e7 100644 (file)
@@ -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:
index 0f410eecfca902dd45799f1bdbb68f4b47761661..2a940f97628d09f009aa5ac9cf411f3f31eeed5f 100644 (file)
@@ -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')
index 54ab4af318ec812c9a6dadf837644de1d9c1f584..876ea08ce04d86ad04a0a3285bdbf623ef2df6fa 100644 (file)
@@ -6,9 +6,6 @@ CL_STDOUT, CL_STDERR = CL_OUT.communicate()
 if "18.00." in CL_STDERR:
     VC_VERSION = '12.0'
     LCGDIR = '#../lib/windows_vc12'
-elif "17.00." in CL_STDERR:
-    VC_VERSION = '11.0'
-    LCGDIR = '#../lib/windows_vc11'
 elif "15.00." in  CL_STDERR:
     VC_VERSION = '9.0'
     LCGDIR = '#../lib/windows'
@@ -23,12 +20,8 @@ WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-if VC_VERSION == '11.0':
-    BF_FFMPEG_LIB = 'avformat-54.lib avcodec-54.lib avdevice-54.lib avutil-52.lib avfilter-3.lib swscale-2.lib swresample-0.lib'
-    BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-54.dll ${BF_FFMPEG_LIBPATH}/avcodec-54.dll ${BF_FFMPEG_LIBPATH}/avdevice-54.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/avfilter-3.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll'
-else:
-    BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
-    BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.4'
@@ -43,10 +36,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = False
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-if VC_VERSION == '11.0':
-    BF_OPENAL_LIB = 'OpenAL32'
-else:
-    BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = True
@@ -70,10 +60,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
-if VC_VERSION == '11.0':
-    BF_SDL_LIB = 'SDL.lib dxguid.lib'
-else:
-    BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIB = 'SDL.lib'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 BF_PTHREADS = LIBDIR + '/pthreads'
@@ -212,9 +199,6 @@ BF_BOOST_INC = '${BF_BOOST}/include'
 if VC_VERSION == '12.0':
     BF_BOOST_LIB = 'libboost_date_time-vc120-mt-s-1_55 libboost_filesystem-vc120-mt-s-1_55 libboost_regex-vc120-mt-s-1_55 libboost_system-vc120-mt-s-1_55 libboost_thread-vc120-mt-s-1_55 libboost_wave-vc120-mt-s-1_55'
     BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc120-mt-s-1_55'
-elif VC_VERSION == '11.0':
-    BF_BOOST_LIB = 'libboost_date_time-vc110-mt-s-1_53 libboost_filesystem-vc110-mt-s-1_53 libboost_regex-vc110-mt-s-1_53 libboost_system-vc110-mt-s-1_53 libboost_thread-vc110-mt-s-1_53 libboost_wave-vc110-mt-s-1_53'
-    BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc110-mt-s-1_53'
 else:
     BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
     BF_BOOST_LIB_INTERNATIONAL = 'libboost_locale-vc90-mt-s-1_49'
@@ -223,12 +207,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-
-# Workaround for ptxas.exe crash on VS2012 and cuda 5.5
-if VC_VERSION == '11.0':
-       BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
-else:
-       BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
@@ -278,9 +257,6 @@ if VC_VERSION == '12.0':
     BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
     BF_BUILDDIR = '..\\build\\win32-vc12'
     BF_INSTALLDIR='..\\install\\win32-vc12'
-elif VC_VERSION == '11.0':
-    BF_BUILDDIR = '..\\build\\win32-vc11'
-    BF_INSTALLDIR='..\\install\\win32-vc11'
 else:
     BF_BUILDDIR = '..\\build\\win32-vc'
     BF_INSTALLDIR='..\\install\\win32-vc'
index 87af137814feeb26e836fc65eb60827a89176a31..e09aadf487333b099b8a94d888a06cbde3f450cb 100644 (file)
@@ -6,9 +6,6 @@ CL_STDOUT, CL_STDERR = CL_OUT.communicate()
 if "18.00." in CL_STDERR:
     VC_VERSION = '12.0'
     LCGDIR = '#../lib/win64_vc12'
-elif "17.00." in CL_STDERR:
-    VC_VERSION = '11.0'
-    LCGDIR = '#../lib/win64_vc11'
 elif "15.00." in  CL_STDERR:
     VC_VERSION = '9.0'
     LCGDIR = '#../lib/win64'
@@ -23,12 +20,8 @@ WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-if VC_VERSION == '11.0':
-    BF_FFMPEG_LIB = 'avformat-54.lib avcodec-54.lib avdevice-54.lib avutil-52.lib avfilter-3.lib swscale-2.lib swresample-0.lib'
-    BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-54.dll ${BF_FFMPEG_LIBPATH}/avcodec-54.dll ${BF_FFMPEG_LIBPATH}/avdevice-54.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/avfilter-3.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll'
-else:
-    BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
-    BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
     
 
 BF_PYTHON = LIBDIR + '/python'
@@ -44,10 +37,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = False
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-if VC_VERSION == '11.0':
-    BF_OPENAL_LIB = 'OpenAL32'
-else:
-    BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SNDFILE = True
@@ -65,10 +55,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
-if VC_VERSION == '11.0':
-    BF_SDL_LIB = 'SDL.lib dxguid.lib'
-else:
-    BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIB = 'SDL.lib'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_JACK = False
@@ -215,9 +202,6 @@ BF_BOOST_INC = '${BF_BOOST}/include'
 if VC_VERSION == '12.0':
     BF_BOOST_LIB = 'libboost_date_time-vc120-mt-s-1_55 libboost_filesystem-vc120-mt-s-1_55 libboost_regex-vc120-mt-s-1_55 libboost_system-vc120-mt-s-1_55 libboost_thread-vc120-mt-s-1_55 libboost_wave-vc120-mt-s-1_55'
     BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc120-mt-s-1_55'
-elif VC_VERSION == '11.0':
-    BF_BOOST_LIB = 'libboost_date_time-vc110-mt-s-1_53 libboost_filesystem-vc110-mt-s-1_53 libboost_regex-vc110-mt-s-1_53 libboost_system-vc110-mt-s-1_53 libboost_thread-vc110-mt-s-1_53 libboost_wave-vc110-mt-s-1_53'
-    BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc110-mt-s-1_53'
 else:
     BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
     BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc90-mt-s-1_49'
@@ -274,9 +258,6 @@ if VC_VERSION == '12.0':
     BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
     BF_BUILDDIR = '..\\build\\win64-vc12'
     BF_INSTALLDIR='..\\install\\win64-vc12'
-elif VC_VERSION == '11.0':
-    BF_BUILDDIR = '..\\build\\win64-vc11'
-    BF_INSTALLDIR='..\\install\\win64-vc11'
 else:
     BF_BUILDDIR = '..\\build\\win64-vc'
     BF_INSTALLDIR='..\\install\\win64-vc'
index 3450f29266825bb8ccf795db29d403a43b5d9629..6b0ce4ed99cef7191e7475f0a5e43999a8a33fef 100644 (file)
@@ -680,8 +680,6 @@ def buildslave(target=None, source=None, env=None):
     if platform == 'darwin':
         platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
 
-    if env['MSVC_VERSION'] == '11.0':
-        platform = env['OURPLATFORM'] + '11'
     if env['MSVC_VERSION'] == '12.0':
         platform = env['OURPLATFORM'] + '12'