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
path: root/source
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2012-05-10 15:37:41 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-05-10 15:37:41 +0400
commitf91fa9d2ce57ee6488b86260b9617db7fca3cb33 (patch)
treed7b75b52b7bd03f05136796285e3771237c42f57 /source
parent4bf0e61de2168a97d369f35b6e14dfaaae37c43b (diff)
Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2
Diffstat (limited to 'source')
-rw-r--r--source/creator/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d069811168d..68cc2854749 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -584,7 +584,14 @@ elseif(WIN32)
${LIBDIR}/ffmpeg/lib/swscale-2.dll
DESTINATION ${TARGETDIR}
)
-
+ if(WITH_MINGW64)
+ install(
+ FILES
+ ${LIBDIR}/ffmpeg/lib/swresample-0.dll
+ ${LIBDIR}/ffmpeg/lib/xvidcore.dll
+ DESTINATION ${TARGETDIR}
+ )
+ endif()
endif()
if(WITH_CODEC_SNDFILE)