diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
| commit | 1ff373ef5bb0c1462ad8b0f30cfb773e30cbb2bb (patch) | |
| tree | b6ec7b01b644cc8c0d4d743a4d3d94551b59f2b1 /source/blender/blenkernel/SConscript | |
| parent | 594b0298c7a672fca44890d3afd1e5bf4f06c1da (diff) | |
| parent | 2636be0ac0d3139b2c9cf54f6380b2e9a3d3ed51 (diff) | |
svn merge -r40166:40279 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 5da24bc43be..5281e590cd5 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -4,7 +4,7 @@ import os sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') -incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include' +incs = '. #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' |