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/object/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/object/SConscript')
| -rw-r--r-- | source/blender/editors/object/SConscript | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index d3e7df92471..4607cc4b1bf 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -1,12 +1,13 @@ #!/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 ../../blenloader' incs += ' ../../makesrna ../../python ../../ikplugin ../../bmesh' incs += ' ../../render/extern/include ../../gpu' # for object_bake.c +incs += ' #extern/recastnavigation/Recast/Include' defs = [] @@ -19,5 +20,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): if env['WITH_BF_PYTHON']: defs.append('WITH_PYTHON') + +if env['WITH_BF_GAMEENGINE']: + defs.append('WITH_GAMEENGINE') env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] ) |