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.txt26
1 files changed, 16 insertions, 10 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 83804ab1a7f..3e1b7772d17 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -448,7 +448,7 @@ elseif(WIN32)
DESTINATION ${TARGETDIR}
)
- if(WITH_INTERNATIONAL)
+ if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
install(
FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
DESTINATION ${TARGETDIR}
@@ -523,11 +523,14 @@ elseif(WIN32)
DESTINATION ${TARGETDIR}
)
else()
- install(
- FILES
- ${LIBDIR}/zlib/lib/zlib.dll
- DESTINATION ${TARGETDIR}
- )
+ #not needed since we link statically, maybe also unneeded for MinGW?
+ if(NOT WITH_MINGW64)
+ install(
+ FILES
+ ${LIBDIR}/zlib/lib/zlib.dll
+ DESTINATION ${TARGETDIR}
+ )
+ endif()
endif()
if(MSVC)
@@ -536,10 +539,13 @@ elseif(WIN32)
DESTINATION ${TARGETDIR}
)
else()
- install(
- FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
- DESTINATION ${TARGETDIR}
- )
+ #MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
+ if(NOT WITH_MINGW64)
+ install(
+ FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
+ DESTINATION ${TARGETDIR}
+ )
+ endif()
endif()
if(WITH_CODEC_FFMPEG)