diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-28 19:49:26 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-28 19:49:26 +0400 |
| commit | edfb47ffb4b92fa7191eef205a88d6f6096e7c6f (patch) | |
| tree | 19e1665d7f9e53b3c3637872f23f91ff2ccd4fa8 | |
| parent | 801d8b600f301d825aa8c4da94d26d5367abf924 (diff) | |
* 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
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 5c4af916327..4d6ef7ccb49 100644 --- a/SConstruct +++ b/SConstruct @@ -643,7 +643,6 @@ if env['WITH_BF_DOCS']: except: epydoc = None if epydoc: - SConscript('source/blender/python/api2_2x/doc/SConscript') SConscript('source/gameengine/PyDoc/SConscript') else: print "No epydoc install detected, Python API and Gameengine API Docs will not be generated " 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']) |