diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-21 15:35:04 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-21 15:35:04 +0300 |
commit | 322ff7dfe42a77da4caf63fcaa98a82ef6e6ecad (patch) | |
tree | 32a357a9480f1d8b8287f6ba7eea71d8aac2c42e /source/blender/imbuf | |
parent | c14aca0e95cee8262d2680364859983eca729c67 (diff) |
I swear, it was just an innocence change in guardedalloc!
The butterfly wing flap, causing a nice storm in the rest of blender.
Now all dependencies should point ok again. CMakers, do double-test.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/SConscript | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/SConscript | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index f007305e148..c2c9c89ad10 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC ../avi ../blenlib ../blenkernel + ../blenloader ../makesdna ../../../intern/memutil ../../../intern/guardedalloc diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index c5c08a2856a..ecb9a89c274 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib' -incs += ' ../avi ../blenkernel' +incs += ' ../avi ../blenkernel ../blenloader' incs += ' ' + env['BF_JPEG_INC'] diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index f01de6b2620..92cba72c094 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC .. ../.. ../../../blenkernel + ../../../blenloader ../../../blenlib ../../../makesdna ../../../../../intern/guardedalloc diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript index 25088c6e34a..e1afb5ebd2d 100644 --- a/source/blender/imbuf/intern/cineon/SConscript +++ b/source/blender/imbuf/intern/cineon/SConscript @@ -5,6 +5,7 @@ source_files = env.Glob('*.c') incs = ['.', '../../../blenkernel', + '../../../blenloader', '../../', '..', '../../../blenlib', |