diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:38:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:38:57 +0400 |
| commit | ca662d0fd651ad0fa159bbeacb31a49f11f37526 (patch) | |
| tree | 11aec4952e6d3478b8755850accb300c86591875 /source/blender/blenkernel/SConscript | |
| parent | 07687cef7dcfda9e6f668e491515b61c072d82c9 (diff) | |
| parent | 56460a0340b6afdb26fa19eb5bd92eda1a1693aa (diff) | |
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index ca7dfcaa355..5da24bc43be 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -1,7 +1,8 @@ #!/usr/bin/python Import ('env') +import os -sources = env.Glob('intern/*.c') +sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' @@ -91,6 +92,12 @@ if env['WITH_BF_LZMA']: incs += ' #/extern/lzma' defs.append('WITH_LZMA') +if env['WITH_BF_GAMEENGINE']: + incs += ' #/extern/recastnavigation/Recast/Include' + defs.append('WITH_GAMEENGINE') +else: + sources.remove('intern' + os.sep + 'navmesh_conversion.cpp') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |