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

CMake/SCons: finish removing MSVC2012 references

Browse Source
This commit is contained in:
Campbell Barton
2014-05-15 16:12:15 +10:00
parent c7ab68f1c4
commit b252915b68
4 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/creator/CMakeLists.txt
View 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(