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

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

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

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