[Bf-blender-cvs] [3ab0a4d] master: Enable openmp in MinGW-w64

[Antony Riakiotakis]

Commit: 3ab0a4da73f4fe29b67553e5f86c306d8e42b9b0
Author: Antony Riakiotakis
Date:   Mon Apr 7 03:51:02 2014 +0300
https://developer.blender.org/rB3ab0a4da73f4fe29b67553e5f86c306d8e42b9b0

Enable openmp in MinGW-w64

===================================================================

M	CMakeLists.txt
M	build_files/scons/config/win64-mingw-config.py

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b57251..97cacfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1362,8 +1362,6 @@ elseif(WIN32)
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
 			
 			add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
-			# Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
-			set(WITH_OPENMP OFF)
 		endif()
 
 		add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index bb55354..1380a47 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -169,8 +169,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
 
-#May produce errors with unsupported MinGW-w64 builds
-WITH_BF_OPENMP = False
+WITH_BF_OPENMP = True
 
 #Freestyle
 WITH_BF_FREESTYLE = True