diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
| commit | 75b393612809252349bf4062bc45df14c1a5dfe5 (patch) | |
| tree | 12650c13c6e927a9e084491aca3d09b77f4f4974 /source/blender/editors/util/SConscript | |
| parent | ceb9b237f224a480ef13ca151af07aa2d1e1ea60 (diff) | |
| parent | fbf3a76f1d4b50b81334f55efbff7a1e6ba1f413 (diff) | |
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/util/SConscript')
| -rw-r--r-- | source/blender/editors/util/SConscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index 2d5ee84333b..04d783e1ee1 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -1,11 +1,15 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('*.c') +sources = env.Glob('*.c') + env.Glob('*.cpp') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna ../../bmesh' +incs += ' #extern/recastnavigation/Recast/Include' incs += ' ../../blenloader' -env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[130] ) +if not env['WITH_BF_GAMEENGINE']: + sources.remove('navmesh_conversion.cpp') + +env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core','player'], priority=[330,210] ) |