forked from bartvdbraak/blender
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:
parent
fccceaa87f
commit
5132b6a173
@ -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 )
|
||||||
|
@ -8,7 +8,8 @@ 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']:
|
||||||
defs += ' PARALLEL'
|
if env['OURPLATFORM'] != 'darwin':
|
||||||
|
defs += ' PARALLEL'
|
||||||
|
|
||||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
||||||
defs += ' USE_MSVC6FIXES'
|
defs += ' USE_MSVC6FIXES'
|
||||||
|
Loading…
Reference in New Issue
Block a user