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/modifiers/SConscript | |
parent | 460cde345bd7779f7dc011b7154c7497be46d799 (diff) | |
parent | 9d1b4b63b33b77505f4399a4db4f462f5b1fd1eb (diff) |
svn merge ^/trunk/blender -r40395:40405
Diffstat (limited to 'source/blender/modifiers/SConscript')
-rw-r--r-- | source/blender/modifiers/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 635fd2100ba..c1f2ca63f6b 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -1,7 +1,7 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') +sources = env.Glob('intern/*.c') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include' @@ -21,7 +21,7 @@ if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') if env['WITH_BF_GAMEENGINE']: - incs += ' #/extern/recastnavigation/Recast/Include' + incs += ' #/extern/recastnavigation' defs.append('WITH_GAMEENGINE') env.BlenderLib ( libname = 'bf_modifiers', sources = sources, |