[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35028] trunk/blender/source: I swear, it was just an innocence change in guardedalloc!
Nathan Letwory
nathan at letworyinteractive.com
Mon Feb 21 13:35:05 CET 2011
Revision: 35028
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35028
Author: jesterking
Date: 2011-02-21 12:35:04 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenlib/SConscript
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/SConscript
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/collada/SConscript
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/curve/SConscript
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/SConscript
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/SConscript
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/metaball/SConscript
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/SConscript
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/SConscript
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/SConscript
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/SConscript
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/SConscript
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/SConscript
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/SConscript
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/SConscript
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/SConscript
trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/makesdna/intern/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -28,6 +28,7 @@
.
../makesdna
../blenkernel
+ ../blenloader
../gpu
../../../intern/ghost
../../../intern/guardedalloc
Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/blenlib/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
cflags=''
-incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu'
+incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu ../blenloader'
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_ZLIB_INC']
defs = ''
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -30,6 +30,7 @@
../blenlib
../imbuf
../makesdna
+ ../blenloader
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/blenpluginapi/SConscript
===================================================================
--- trunk/blender/source/blender/blenpluginapi/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/blenpluginapi/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -3,7 +3,7 @@
sources = env.Glob('intern/*.c')
-incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna'
+incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna ../blenloader'
defs = []
Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/collada/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -30,6 +30,7 @@
.
../blenlib
../blenkernel
+ ../blenloader
../windowmanager
../makesdna
../makesrna
Modified: trunk/blender/source/blender/collada/SConscript
===================================================================
--- trunk/blender/source/blender/collada/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/collada/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -30,11 +30,12 @@
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')
Modified: trunk/blender/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/animation/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/animation/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -22,6 +22,7 @@
set(INC
../include
../../blenkernel
+ ../../blenloader
../../blenlib
../../makesdna
../../makesrna
Modified: trunk/blender/source/blender/editors/animation/SConscript
===================================================================
--- trunk/blender/source/blender/editors/animation/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/animation/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -4,6 +4,6 @@
sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] )
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -22,6 +22,7 @@
set(INC
../include
../../blenkernel
+ ../../blenloader
../../blenlib
../../makesdna
../../makesrna
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/armature/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -3,7 +3,7 @@
sources = env.Glob('*.c')
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf ../../blenloader'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
Modified: trunk/blender/source/blender/editors/curve/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/curve/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/curve/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -22,6 +22,7 @@
set(INC
../include
../../blenkernel
+ ../../blenloader
../../blenlib
../../makesdna
../../makesrna
Modified: trunk/blender/source/blender/editors/curve/SConscript
===================================================================
--- trunk/blender/source/blender/editors/curve/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/curve/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -5,7 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu'
+incs += ' ../../gpu ../../blenloader'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] )
Modified: trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -22,6 +22,7 @@
set(INC
../include
../../blenkernel
+ ../../blenloader
../../blenlib
../../imbuf
../../makesdna
Modified: trunk/blender/source/blender/editors/gpencil/SConscript
===================================================================
--- trunk/blender/source/blender/editors/gpencil/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/gpencil/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -5,7 +5,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu'
+incs += ' ../../gpu ../../blenloader'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] )
Modified: trunk/blender/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-02-21 12:35:04 UTC (rev 35028)
@@ -23,6 +23,7 @@
../include
../../blenfont
../../blenkernel
+ ../../blenloader
../../blenlib
../../gpu
../../imbuf
Modified: trunk/blender/source/blender/editors/interface/SConscript
===================================================================
--- trunk/blender/source/blender/editors/interface/SConscript 2011-02-21 12:18:34 UTC (rev 35027)
+++ trunk/blender/source/blender/editors/interface/SConscript 2011-02-21 12:35:04 UTC (rev 35028)
@@ -8,7 +8,7 @@
incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu'
-incs += ' #/extern/glew/include'
+incs += ' #/extern/glew/include ../../blenloader'
incs += ' ../../python/' # python button eval
defs = []
Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list