diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-05-02 00:57:39 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-05-02 00:57:39 +0400 |
| commit | e54a0039dc93535bd6518766fc29790aa627e250 (patch) | |
| tree | a68f0f46f3840128fde4c15f088600670a579bfe | |
| parent | c6051ea87b21f408dbf70d6679500f9a655914e7 (diff) | |
Add pthread dll for MinGW64 during installation. Now people who download from buildbot will be able to run the build even without MinGW-w64 installed.
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index b1603fd0397..46ce989e9c0 100644 --- a/SConstruct +++ b/SConstruct @@ -805,6 +805,7 @@ if env['OURPLATFORM'] == 'win64-mingw': dllsources.append('${LCGDIR}/sdl/lib/SDL.dll') dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll') + dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll') dllsources.append('#source/icons/blender.exe.manifest') windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9168b634250..f4c3964ab83 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -566,6 +566,11 @@ elseif(WIN32) FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll DESTINATION ${TARGETDIR} ) + elseif(WITH_MINGW64) + install( + FILES ${LIBDIR}/binaries/pthreadGC2-w64.dll + DESTINATION ${TARGETDIR} + ) endif() endif() |