part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)

This commit is contained in:
2010-07-19 04:44:37 +00:00
1714 changed files with 119636 additions and 84178 deletions

View File

@@ -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 )