diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 14:58:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 14:58:20 +0400 |
| commit | 161c3861bc09d3e666d4c73d35da85e024fe779f (patch) | |
| tree | 4bcb6ce4b9fc7820690f2e2330093d8168f2ba6f /source/blender/blenkernel/SConscript | |
| parent | 460cde345bd7779f7dc011b7154c7497be46d799 (diff) | |
| parent | 9d1b4b63b33b77505f4399a4db4f462f5b1fd1eb (diff) | |
svn merge ^/trunk/blender -r40395:40405
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 5281e590cd5..4de6172251f 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -2,7 +2,7 @@ Import ('env') import os -sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') +sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' @@ -93,10 +93,10 @@ if env['WITH_BF_LZMA']: defs.append('WITH_LZMA') if env['WITH_BF_GAMEENGINE']: - incs += ' #/extern/recastnavigation/Recast/Include' + incs += ' #/extern/recastnavigation' defs.append('WITH_GAMEENGINE') else: - sources.remove('intern' + os.sep + 'navmesh_conversion.cpp') + sources.remove('intern' + os.sep + 'navmesh_conversion.c') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |