diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-08-22 04:06:09 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-08-22 04:06:09 +0400 |
| commit | 3793e178f46b571a9c026e139eac1bbe59b83c82 (patch) | |
| tree | aff361a1b4808ac70c70622f92eec7c8a1778003 | |
| parent | 59c71eb00ad2b798af6b7ff7959225e975201e2b (diff) | |
Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well.
This should make MinGW64 builds quite stable again :)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 338135f4987..6bb5d8af627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1043,6 +1043,8 @@ 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 27286439297..ffd37065e35 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -170,7 +170,7 @@ WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] #May produce errors with unsupported MinGW-w64 builds -WITH_BF_OPENMP = True +WITH_BF_OPENMP = False ## CC = 'gcc' |