diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
commit | 71003b9bcc88ecf6138c3debb9abba4637c8e61a (patch) | |
tree | 7f85d40231311a36a72f731a7c07b8dbd6fff577 /source/blender/editors/render/SConscript | |
parent | ea540496c8281dcba899fb6b29c1bcfbb53a0482 (diff) | |
parent | 790d6ca256e6b572826b2bf214c6fd6c8a623969 (diff) |
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
Diffstat (limited to 'source/blender/editors/render/SConscript')
-rw-r--r-- | source/blender/editors/render/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index f7aaff883f6..bd6dcf73546 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -24,4 +24,8 @@ if env['WITH_BF_QUICKTIME']: if env['USE_QTKIT']: env.Append(CFLAGS=['-DUSE_QTKIT']) +if env['OURPLATFORM'] == 'darwin': + if env['WITH_BF_OPENMP']: + env.Append(CFLAGS=['-DPARALLEL=1']) + env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45]) |