From edfb47ffb4b92fa7191eef205a88d6f6096e7c6f Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 28 Sep 2009 15:49:26 +0000 Subject: * Copy() -> Clone() (even though these hopefully will be obliterated from extern/ soon) * remove reference to docs SConscript * python dbg commit - somehow this one was left uncommitted when I was working on r23465 and r23464 --- source/gameengine/Converter/SConscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/gameengine/Converter/SConscript') diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 5f6e9df521b..8a5eb8a341c 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -13,7 +13,7 @@ incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender' incs += ' #source/blender/editors/include #source/blender/makesdna #source/gameengine/Rasterizer' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic' incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph' -incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde' +incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet' incs += ' #source/gameengine/Physics/Dummy' incs += ' #source/gameengine/Network/LoopBackNetwork' incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' @@ -24,4 +24,8 @@ incs += ' #source/blender/ikplugin' incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_BULLET_INC'] +if env['BF_DEBUG']: + if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc'): + defs.append('_DEBUG') + env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS']) -- cgit v1.2.3 From 98ee2a781dd20bb58f72ee5700a11b2dd5124d74 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Sep 2009 21:42:40 +0000 Subject: option to build the BGE without python, uses existing python check (cmake and scons) when python is disabled videotextures are not built. --- source/gameengine/Converter/SConscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/gameengine/Converter/SConscript') diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 8a5eb8a341c..616c205732c 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -21,11 +21,15 @@ incs += ' #source/blender/windowmanager' incs += ' #source/blender/makesrna' incs += ' #source/blender/ikplugin' -incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_BULLET_INC'] if env['BF_DEBUG']: if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc'): defs.append('_DEBUG') + +if env['WITH_BF_PYTHON']: + incs += ' ' + env['BF_PYTHON_INC'] +else: + defs.append('DISABLE_PYTHON') env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS']) -- cgit v1.2.3