Revision: 23538
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23538
Author: jesterking
Date: 2009-09-28 17:49:26 +0200 (Mon, 28 Sep 2009)
Log Message:
-----------
* 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
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/extern/ffmpeg/SConscript
trunk/blender/extern/x264/SConscript
trunk/blender/extern/xvidcore/SConscript
trunk/blender/source/gameengine/Converter/SConscript
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2009-09-28 15:47:05 UTC (rev 23537)
+++ trunk/blender/SConstruct 2009-09-28 15:49:26 UTC (rev 23538)
@@ -643,7 +643,6 @@
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 "
Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript 2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/ffmpeg/SConscript 2009-09-28 15:49:26 UTC (rev
23538)
@@ -28,7 +28,7 @@
from sets import Set
-ff_env = env.Copy();
+ff_env = env.Clone()
ff_env.Replace(CCFLAGS = '')
ff_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/extern/x264/SConscript
===================================================================
--- trunk/blender/extern/x264/SConscript 2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/x264/SConscript 2009-09-28 15:49:26 UTC (rev
23538)
@@ -11,7 +11,7 @@
from sets import Set
-x264_env = env.Copy();
+x264_env = env.Clone()
x264_env.Replace(CCFLAGS = '')
x264_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/extern/xvidcore/SConscript
===================================================================
--- trunk/blender/extern/xvidcore/SConscript 2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/xvidcore/SConscript 2009-09-28 15:49:26 UTC (rev
23538)
@@ -16,7 +16,7 @@
from sets import Set
-xvidcore_env = env.Copy();
+xvidcore_env = env.Clone()
xvidcore_env.Replace(CCFLAGS = '')
xvidcore_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2009-09-28
15:47:05 UTC (rev 23537)
+++ trunk/blender/source/gameengine/Converter/SConscript 2009-09-28
15:49:26 UTC (rev 23538)
@@ -13,7 +13,7 @@
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 += ' ' + 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'])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
