kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX: Disable parallel openMP for elbeem library until a proper fix is found (currently makes fluid sim crash) (Bug# 20043)

Browse Source 
Thx Jens Verwiebe for the investigation!
This commit is contained in:
Damien Plisson 2009-12-08 09:58:42 +00:00
parent fccceaa87f
commit 5132b6a173
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/elbeem/CMakeLists.txt
View File

@ -33,9 +33,9 @@ IF(WINDOWS)
ADD_DEFINITIONS(-DUSE_MSVC6FIXES) ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
ENDIF(WINDOWS) ENDIF(WINDOWS)
IF(WITH_OPENMP) IF(WITH_OPENMP AND NOT APPLE)
ADD_DEFINITIONS(-DPARALLEL=1) ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP AND NOT APPLE)
BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}") BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
#, libtype='blender', priority=0 ) #, libtype='blender', priority=0 )

1
intern/elbeem/SConscript
View File

@ -8,6 +8,7 @@ sources = env.Glob('intern/*.cpp')
defs = 'NOGUI ELBEEM_BLENDER=1' defs = 'NOGUI ELBEEM_BLENDER=1'
if env['WITH_BF_OPENMP']: if env['WITH_BF_OPENMP']:
if env['OURPLATFORM'] != 'darwin':
defs += ' PARALLEL' defs += ' PARALLEL'
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):