CMake/SCons: finish removing MSVC2012 references
authorCampbell Barton <ideasman42@gmail.com>
Thu, 15 May 2014 06:12:15 +0000 (16:12 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 15 May 2014 06:16:25 +0000 (16:16 +1000)
CMakeLists.txt
SConstruct
intern/cycles/SConscript
source/creator/CMakeLists.txt

index dd580fb531afb42b512485d788129ecbd99ed1c5..2962b58824daf414c162fc683299ad60be808ab1 100644 (file)
@@ -1540,7 +1540,7 @@ elseif(WIN32)
                set(OPENAL ${LIBDIR}/openal)
                set(OPENALDIR ${LIBDIR}/openal)
                set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-               if(MSVC11 OR MSVC12)
+               if(MSVC12)
                        set(OPENAL_LIBRARY openal32)
                else()
                        set(OPENAL_LIBRARY wrap_oal)
index 0258f7768240bf825c5991629858b9cf406f273a..251f7eae92e118d4e7ea1293457e548fd0e7ad49 100644 (file)
@@ -505,8 +505,6 @@ else:
 env['CPPFLAGS'].append('-DWITH_AUDASPACE')
 env['CPPFLAGS'].append('-DWITH_AVI')
 env['CPPFLAGS'].append('-DWITH_OPENNL')
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
-    env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
 
 if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
     env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
@@ -1100,10 +1098,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
 
     if env['WITH_BF_OPENAL']:
         dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
-        if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
-            pass
-        else:
-            dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+        dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
 
     if env['WITH_BF_SNDFILE']:
         dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
index 532238b9d7eb88c3646eea0f82e7dbb1caad57aa..542bb82cf2aa376fc576269bac5c4f16e0a71420 100644 (file)
@@ -95,7 +95,7 @@ elif env['OURPLATFORM'] == 'win64-vc':
     kernel_flags['sse2'] = '-D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /GS-'
     kernel_flags['sse3'] = kernel_flags['sse2']
 
-    if env['MSVC_VERSION'] in ('11.0', '12.0'):
+    if env['MSVC_VERSION'] >= '12.0':
         kernel_flags['sse41'] = kernel_flags['sse3']
         kernel_flags['avx'] = kernel_flags['sse41'] + ' /arch:AVX'
 else:
index a7a3d602c951f8be77ff0536927b0eb003e2804f..4943256161fc04e0fd0a80d78bbbc9c805f22ec7 100644 (file)
@@ -648,19 +648,7 @@ elseif(WIN32)
        endif()
 
        if(WITH_CODEC_FFMPEG)
-               if(MSVC11)
-                       install(
-                               FILES
-                                       ${LIBDIR}/ffmpeg/lib/avcodec-54.dll
-                                       ${LIBDIR}/ffmpeg/lib/avformat-54.dll
-                                       ${LIBDIR}/ffmpeg/lib/avdevice-54.dll
-                                       ${LIBDIR}/ffmpeg/lib/avutil-52.dll
-                                       ${LIBDIR}/ffmpeg/lib/avfilter-3.dll
-                                       ${LIBDIR}/ffmpeg/lib/swresample-0.dll
-                                       ${LIBDIR}/ffmpeg/lib/swscale-2.dll
-                               DESTINATION ${TARGETDIR}
-                       )
-               elseif(WITH_MINGW64)                    
+               if(WITH_MINGW64)
                        install(
                                FILES
                                        ${LIBDIR}/ffmpeg/lib/avcodec-53.dll
@@ -693,38 +681,14 @@ elseif(WIN32)
        endif()
 
        if(WITH_OPENAL)
-               if(MSVC11)
-                       install(
-                               FILES
-                                       ${LIBDIR}/openal/lib/OpenAL32.dll
-                               DESTINATION ${TARGETDIR}
-                       )
-               else()
-                       install(
-                               FILES
-                                       ${LIBDIR}/openal/lib/OpenAL32.dll
-                                       ${LIBDIR}/openal/lib/wrap_oal.dll
-                               DESTINATION ${TARGETDIR}
-                       )
-               endif()
+               install(
+                       FILES
+                               ${LIBDIR}/openal/lib/OpenAL32.dll
+                               ${LIBDIR}/openal/lib/wrap_oal.dll
+                       DESTINATION ${TARGETDIR}
+               )
        endif()
 
-#      if(WITH_JACK AND MSVC11)
-#              if(CMAKE_CL_64)
-#                      install(
-#                              FILES
-#                                      ${LIBDIR}/jack/lib/libjack64.dll
-#                              DESTINATION ${TARGETDIR}
-#                      )
-#              else()
-#                      install(
-#                              FILES
-#                                      ${LIBDIR}/jack/lib/libjack.dll
-#                              DESTINATION ${TARGETDIR}
-#                      )
-#              endif()
-#      endif()
-
        if(WITH_SDL)
                if(NOT CMAKE_CL_64)
                        install(