Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default...
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 5 Jul 2012 11:39:11 +0000 (11:39 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 5 Jul 2012 11:39:11 +0000 (11:39 +0000)
CMakeLists.txt
SConstruct
build_files/scons/config/win64-mingw-config.py
source/creator/CMakeLists.txt

index 7a504b0a986bd09129f82ceffc12a9c86314cc76..75cefd0c2198c20ab9f02ce336763d9bcfe6cec6 100644 (file)
@@ -148,7 +148,7 @@ mark_as_advanced(WITH_AUDASPACE)
 
 
 # (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)
index 088361af6497d3696de39efd99177ff3cc488337..1da1334f1f0daacb2c4fe3476ee69fd6552a60c7 100644 (file)
@@ -769,8 +769,13 @@ if env['OURPLATFORM'] == 'win64-mingw':
     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)
index 2649c5505d5d5ba5ddf46d3286a58629253be7ae..272864392974f7746693404aacf0818ebe581e22 100644 (file)
@@ -169,8 +169,8 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 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'
index d9ac43d7622e0e4445f9e4ede462d933c79c378f..940c92b349cbb68bbd845044a80ac23606f1e54c 100644 (file)
@@ -551,9 +551,20 @@ elseif(WIN32)
                        )
                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()