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/collada | |
| 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/collada')
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/collada/SConscript | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index ce204013f3d..73e81025226 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -30,6 +30,7 @@ set(INC . ../blenlib ../blenkernel + ../blenloader ../windowmanager ../makesdna ../makesrna diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index e026f2fb022..10c3fcaeb96 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -30,11 +30,12 @@ Import ('env') sources = env.Glob('*.cpp') defs = [] +# TODO sanitize inc path building # relative paths to include dirs, space-separated, string if env['OURPLATFORM']=='darwin': - incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) else: - incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) if env['BF_BUILDINFO']: defs.append('NAN_BUILDINFO') |