diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-07 04:51:02 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-07 20:01:19 +0400 |
| commit | 3ab0a4da73f4fe29b67553e5f86c306d8e42b9b0 (patch) | |
| tree | bea51f91e1abdadc8ff9f02b7053973c7354d5ab | |
| parent | 574b0e2c3077effcc11c9d5d45511a58acb2e5c8 (diff) | |
Enable openmp in MinGW-w64
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b57251f176..97cacfa6f3c 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 bb55354d591..1380a47d0c8 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 |