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/blenlib/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/blenlib/SConscript')
| -rw-r--r-- | source/blender/blenlib/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 30c8e4dad50..5c45408b3fc 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -4,8 +4,9 @@ Import ('env') sources = env.Glob('intern/*.c') cflags='' -incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include ../gpu ' +incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu' incs += ' ../windowmanager #/extern/glew/include' + incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] defs = 'GLEW_STATIC' @@ -17,4 +18,8 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['OURPLATFORM'] == 'linuxcross': + if env['WITH_BF_OPENMP']: + incs += ' ' + env['BF_OPENMP_INC'] + env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags ) |