* Copy() -> Clone() (even though these hopefully will be obliterated from extern...
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 28 Sep 2009 15:49:26 +0000 (15:49 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 28 Sep 2009 15:49:26 +0000 (15:49 +0000)
* remove reference to docs SConscript
* python dbg commit - somehow this one was left uncommitted when I was working on r23465 and r23464

SConstruct
source/gameengine/Converter/SConscript

index 5c4af9163276e87dc810b944b1a8a8e0dc1fda86..4d6ef7ccb49de29118f83a19d83130796503d744 100644 (file)
@@ -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 "
index 5f6e9df521bf328af8e83610905de1bcbea1e850..8a5eb8a341cbdf27edf248f09cdee5a9d9e08566 100644 (file)
@@ -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'])