diff options
| author | Jürgen Herrmann <shadowrom@me.com> | 2013-05-14 20:16:25 +0400 |
|---|---|---|
| committer | Jürgen Herrmann <shadowrom@me.com> | 2013-05-14 20:16:25 +0400 |
| commit | 44dfc76154c0964ade17b5e2d12dda74f8328e30 (patch) | |
| tree | 1f4181d0cd916c5a4a803ff606848e4792fa2935 /source/creator | |
| parent | 761850f3771c79b3f7ad6ebf8bd6f2a0399bd308 (diff) | |
CMake build system update
- Extending CMakeLists.txt to support builds with VC2012.
- Fix some typo in CMakeLists.txt
- Introduces experimental WITH_AVX_CPU to build with /arch:AVX (VC11 only)
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 0350de5870c..dd2029cafc9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -587,15 +587,29 @@ elseif(WIN32) endif() if(WITH_CODEC_FFMPEG) - install( - FILES - ${LIBDIR}/ffmpeg/lib/avcodec-53.dll - ${LIBDIR}/ffmpeg/lib/avformat-53.dll - ${LIBDIR}/ffmpeg/lib/avdevice-53.dll - ${LIBDIR}/ffmpeg/lib/avutil-51.dll - ${LIBDIR}/ffmpeg/lib/swscale-2.dll - DESTINATION ${TARGETDIR} - ) + 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} + ) + else() + install( + FILES + ${LIBDIR}/ffmpeg/lib/avcodec-53.dll + ${LIBDIR}/ffmpeg/lib/avformat-53.dll + ${LIBDIR}/ffmpeg/lib/avdevice-53.dll + ${LIBDIR}/ffmpeg/lib/avutil-51.dll + ${LIBDIR}/ffmpeg/lib/swscale-2.dll + DESTINATION ${TARGETDIR} + ) + endif() if(WITH_MINGW64) install( FILES |