[Bf-blender-cvs] CVS commit: blender SConstruct blender/extern Makefile blender/source Makefile blender/source/gameengine/Ketsji KX_ConvertPhysicsObject.h SConscript blender/source/gameengine/Physics Makefile blender/source/gameengine SConscript ...
Erwin Coumans
blender at erwincoumans.com
Sun Oct 23 19:55:19 CEST 2005
erwin (Erwin Coumans) 2005/10/23 19:55:19 CEST
Modified files:
. SConstruct
blender/extern Makefile
blender/source Makefile
blender/source/gameengine/Ketsji KX_ConvertPhysicsObject.h
SConscript
blender/source/gameengine/Physics Makefile
blender/source/gameengine SConscript
blender/tools/scons/bs bs_libs.py
Log:
updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.
sorry if this breaks your builds!
Revision Changes Path
1.119 +4 -5 blender/SConstruct
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/SConstruct.diff?r1=1.118&r2=1.119&cvsroot=bf-blender>
1.14 +2 -2 blender/extern/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/Makefile.diff?r1=1.13&r2=1.14&cvsroot=bf-blender>
1.92 +4 -8 blender/source/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/Makefile.diff?r1=1.91&r2=1.92&cvsroot=bf-blender>
1.19 +5 -1 blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h.diff?r1=1.18&r2=1.19&cvsroot=bf-blender>
1.14 +3 -5 blender/source/gameengine/Ketsji/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/SConscript.diff?r1=1.13&r2=1.14&cvsroot=bf-blender>
1.13 +2 -5 blender/source/gameengine/Physics/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Makefile.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
1.7 +2 -3 blender/source/gameengine/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/SConscript.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.10 +2 -2 blender/tools/scons/bs/bs_libs.py
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/tools/scons/bs/bs_libs.py.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
More information about the Bf-blender-cvs
mailing list