[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32381] trunk/blender: Enable CXX_GUARDEDALLOC support through SCons.
Nathan Letwory
nathan at letworyinteractive.com
Fri Oct 8 22:39:57 CEST 2010
Revision: 32381
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32381
Author: jesterking
Date: 2010-10-08 22:39:56 +0200 (Fri, 08 Oct 2010)
Log Message:
-----------
Enable CXX_GUARDEDALLOC support through SCons.
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/intern/guardedalloc/SConscript
trunk/blender/intern/string/SConscript
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Network/SConscript
trunk/blender/source/gameengine/Physics/Bullet/SConscript
trunk/blender/source/gameengine/Physics/Dummy/SConscript
trunk/blender/source/gameengine/Physics/common/SConscript
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
trunk/blender/source/gameengine/SceneGraph/SConscript
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/build_files/scons/tools/btools.py 2010-10-08 20:39:56 UTC (rev 32381)
@@ -92,6 +92,7 @@
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
'BF_NO_ELBEEM',
+ 'WITH_BF_CXX_GUARDEDALLOC',
'BF_VCREDIST' # Windows-only, and useful only when creating installer
]
@@ -453,6 +454,7 @@
(BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
+ (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
('BF_VCREDIST', 'Full path to vcredist', '')
) # end of opts.AddOptions()
Modified: trunk/blender/intern/guardedalloc/SConscript
===================================================================
--- trunk/blender/intern/guardedalloc/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/intern/guardedalloc/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -2,7 +2,14 @@
Import('env')
-sources = env.Glob('intern/*.c')
+defs = []
+
+sources = ['intern/mallocn.c', 'intern/mmap_win.c']
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ sources.append('cpp/mallocn.cpp')
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
incs = '.'
-env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
+env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )
Modified: trunk/blender/intern/string/SConscript
===================================================================
--- trunk/blender/intern/string/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/intern/string/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -4,4 +4,10 @@
sources = env.Glob('intern/*.cpp')
incs = '.'
-env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )
+defs = []
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #intern/guardedalloc'
+
+env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] )
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -30,6 +30,9 @@
else:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Converter/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -32,4 +32,7 @@
else:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Expressions/SConscript
===================================================================
--- trunk/blender/source/gameengine/Expressions/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Expressions/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -12,4 +12,7 @@
else:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/GameLogic/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -23,4 +23,8 @@
if env['BF_DEBUG']:
defs.append('_DEBUG')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #/intern/guardedalloc'
+
env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -40,4 +40,7 @@
if env['BF_DEBUG']:
defs.append('_DEBUG') # for Python
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Network/SConscript
===================================================================
--- trunk/blender/source/gameengine/Network/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Network/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -5,4 +5,10 @@
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core','player'], priority=[400,130] )
+defs = []
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #intern/guardedalloc'
+
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )
Modified: trunk/blender/source/gameengine/Physics/Bullet/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Physics/Bullet/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -27,4 +27,7 @@
else:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Physics/Dummy/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/Dummy/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Physics/Dummy/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -5,4 +5,10 @@
incs = '. ../common'
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,60] )
+defs = []
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #intern/guardedalloc'
+
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,60] )
Modified: trunk/blender/source/gameengine/Physics/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/common/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Physics/common/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -5,4 +5,10 @@
incs = '. ../Dummy #intern/moto/include'
-env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
+defs = []
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #intern/guardedalloc'
+
+env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -10,4 +10,7 @@
incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
incs += ' #intern/guardedalloc #source/blender/blenlib'
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Rasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/Rasterizer/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -13,4 +13,7 @@
else:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+
env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/SceneGraph/SConscript
===================================================================
--- trunk/blender/source/gameengine/SceneGraph/SConscript 2010-10-08 13:08:13 UTC (rev 32380)
+++ trunk/blender/source/gameengine/SceneGraph/SConscript 2010-10-08 20:39:56 UTC (rev 32381)
@@ -6,4 +6,10 @@
incs = '. #intern/moto/include'
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list