Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt50
1 files changed, 7 insertions, 43 deletions
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(