[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48639] trunk/blender: Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.

[Antony Riakiotakis]

Revision: 48639
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48639
Author:   psy-fi
Date:     2012-07-05 11:39:11 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/win64-mingw-config.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-07-05 11:37:04 UTC (rev 48638)
+++ trunk/blender/CMakeLists.txt	2012-07-05 11:39:11 UTC (rev 48639)
@@ -148,7 +148,7 @@
 
 
 # (unix defaults to OpenMP On)
-if(UNIX AND NOT APPLE)
+if((UNIX AND NOT APPLE) OR (MINGW))
 	set(PLATFORM_DEFAULT ON)
 else()
 	set(PLATFORM_DEFAULT OFF)

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-07-05 11:37:04 UTC (rev 48638)
+++ trunk/blender/SConstruct	2012-07-05 11:39:11 UTC (rev 48639)
@@ -769,8 +769,13 @@
     if env['WITH_BF_SDL']:
         dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
 	
+	if(env['WITH_BF_OPENMP'])
+		dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+	
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
-    dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll')
+    dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
+	dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
+	dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll)')
     dllsources.append('#source/icons/blender.exe.manifest')
 
     windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)

Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py	2012-07-05 11:37:04 UTC (rev 48638)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py	2012-07-05 11:39:11 UTC (rev 48639)
@@ -169,8 +169,8 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
 
-#Produces errors while rendering with subsurf/multires,
-WITH_BF_OPENMP = False
+#May produce errors with unsupported MinGW-w64 builds
+WITH_BF_OPENMP = True
 
 ##
 CC = 'gcc'

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-07-05 11:37:04 UTC (rev 48638)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-07-05 11:39:11 UTC (rev 48639)
@@ -551,9 +551,20 @@
 			)
 		elseif(WITH_MINGW64)
 			install(
-				FILES ${LIBDIR}/binaries/pthreadGC2-w64.dll
+				FILES 
+					${LIBDIR}/binaries/libgcc_s_sjlj-1.dll
+					${LIBDIR}/binaries/libwinpthread-1.dll
+					${LIBDIR}/binaries/libstdc++-6.dll
 				DESTINATION ${TARGETDIR}
 			)
+			
+			if(WITH_OPENMP)
+				install(
+					FILES 
+					${LIBDIR}/binaries/libgomp-1.dll
+					DESTINATION ${TARGETDIR}
+				)
+			endif()
 		endif()
 	endif()