diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SConstruct | 7 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 50 |
4 files changed, 10 insertions, 51 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dd580fb531a..2962b58824d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/SConstruct b/SConstruct index 0258f776824..251f7eae92e 100644 --- a/SConstruct +++ b/SConstruct @@ -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') diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 532238b9d7e..542bb82cf2a 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -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: diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a7a3d602c95..4943256161f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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( |