diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
| commit | bbbbea6024812f623f5faf7c15fb210d22c39b31 (patch) | |
| tree | c8a7b62730bb7c1b24d46f5b5609c31b4a69448c /source/blender/editors/animation/SConscript | |
| parent | baaf0d1b68541bace73aeac0747df3076138bcc5 (diff) | |
scons fix
Diffstat (limited to 'source/blender/editors/animation/SConscript')
| -rw-r--r-- | source/blender/editors/animation/SConscript | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index 17f8d32ccf1..3e5133c1174 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -4,11 +4,6 @@ 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 +incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) |