diff options
Diffstat (limited to 'source/blender/editors/animation/SConscript')
| -rw-r--r-- | source/blender/editors/animation/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index ec4b577b349..17f8d32ccf1 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -4,7 +4,11 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' +<<<<<<< .working incs += ' ../../windowmanager ../../bmesh' incs += ' #/intern/guardedalloc #/extern/glew/include' +======= +incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' +>>>>>>> .merge-right.r35190 env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) |