diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
| commit | c11c196efadf5ef52293d782638497f86a209722 (patch) | |
| tree | 43abcd60b2400d28db8686f4dbea68f17475ef58 /source/blender/blenlib/SConscript | |
| parent | f54aa7811029c90b6071ccc9e27e57a758e5884d (diff) | |
| parent | 7f083c45bee15f7540e2a35a725efe28fc962239 (diff) | |
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
Diffstat (limited to 'source/blender/blenlib/SConscript')
| -rw-r--r-- | source/blender/blenlib/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 24e4f1be6da..c319b1923bd 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -22,4 +22,8 @@ if env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_OPENMP']: incs += ' ' + env['BF_OPENMP_INC'] +if env['OURPLATFORM'] == 'darwin': + if env['WITH_BF_OPENMP']: + env.Append(CFLAGS=['-DPARALLEL=1']) + env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags ) |