[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46169] trunk/blender: Add pthread dll for MinGW64 during installation.

[Antony Riakiotakis]

Revision: 46169
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46169
Author:   psy-fi
Date:     2012-05-01 20:57:39 +0000 (Tue, 01 May 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-05-01 20:45:16 UTC (rev 46168)
+++ trunk/blender/SConstruct	2012-05-01 20:57:39 UTC (rev 46169)
@@ -805,6 +805,7 @@
         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)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-05-01 20:45:16 UTC (rev 46168)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-05-01 20:57:39 UTC (rev 46169)
@@ -566,6 +566,11 @@
 				FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
 				DESTINATION ${TARGETDIR}
 			)
+		elseif(WITH_MINGW64)
+			install(
+				FILES ${LIBDIR}/binaries/pthreadGC2-w64.dll
+				DESTINATION ${TARGETDIR}
+			)
 		endif()
 	endif()