[Bf-blender-cvs] [7571f27] master: Fix MinGW64 compilation until we update the libraries.
Antony Riakiotakis
noreply at git.blender.org
Sat Mar 29 23:13:36 CET 2014
Commit: 7571f2707a3346503a0a3732af97708992aa3461
Author: Antony Riakiotakis
Date: Sat Mar 29 22:12:52 2014 +0200
https://developer.blender.org/rB7571f2707a3346503a0a3732af97708992aa3461
Fix MinGW64 compilation until we update the libraries.
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 94ec233..a7a3d60 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -660,6 +660,18 @@ elseif(WIN32)
${LIBDIR}/ffmpeg/lib/swscale-2.dll
DESTINATION ${TARGETDIR}
)
+ elseif(WITH_MINGW64)
+ 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
+ ${LIBDIR}/ffmpeg/lib/swresample-0.dll
+ ${LIBDIR}/ffmpeg/lib/xvidcore.dll
+ DESTINATION ${TARGETDIR}
+ )
else()
install(
FILES
@@ -671,14 +683,6 @@ elseif(WIN32)
DESTINATION ${TARGETDIR}
)
endif()
- if(WITH_MINGW64)
- install(
- FILES
- ${LIBDIR}/ffmpeg/lib/swresample-0.dll
- ${LIBDIR}/ffmpeg/lib/xvidcore.dll
- DESTINATION ${TARGETDIR}
- )
- endif()
endif()
if(WITH_CODEC_SNDFILE)
More information about the Bf-blender-cvs
mailing list