[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16913] branches/soc-2008-unclezeiv: svn merge -r 16842:16911 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Davide Vercelli davide.vercelli at gmail.com
Sat Oct 4 11:43:58 CEST 2008 

Revision: 16913
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16913
Author:   unclezeiv
Date:     2008-10-04 11:43:58 +0200 (Sat, 04 Oct 2008)

Log Message:
-----------
svn merge -r 16842:16911 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/config/win32-vc-config.py
    branches/soc-2008-unclezeiv/extern/SConscript
    branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/soc-2008-unclezeiv/extern/bullet2/src/Bullet-C-Api.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btHashMap.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btPoolAllocator.h
    branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btScalar.h
    branches/soc-2008-unclezeiv/intern/elbeem/intern/mvmcoords.cpp
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_global.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-unclezeiv/source/blender/include/BIF_keyframing.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/NLA.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
    branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
    branches/soc-2008-unclezeiv/source/blender/src/drawarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
    branches/soc-2008-unclezeiv/source/blender/src/drawtime.c
    branches/soc-2008-unclezeiv/source/blender/src/drawview.c
    branches/soc-2008-unclezeiv/source/blender/src/editaction.c
    branches/soc-2008-unclezeiv/source/blender/src/editipo.c
    branches/soc-2008-unclezeiv/source/blender/src/editnla.c
    branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/header_action.c
    branches/soc-2008-unclezeiv/source/blender/src/header_ipo.c
    branches/soc-2008-unclezeiv/source/blender/src/header_nla.c
    branches/soc-2008-unclezeiv/source/blender/src/header_seq.c
    branches/soc-2008-unclezeiv/source/blender/src/header_time.c
    branches/soc-2008-unclezeiv/source/blender/src/imagepaint.c
    branches/soc-2008-unclezeiv/source/blender/src/interface.c
    branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
    branches/soc-2008-unclezeiv/source/blender/src/space.c
    branches/soc-2008-unclezeiv/source/blender/src/toets.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_snap.c
    branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
    branches/soc-2008-unclezeiv/source/blender/src/view.c
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Physics/BlOde/OdePhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Sumo/SumoPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2008-unclezeiv/tools/Blender.py
    branches/soc-2008-unclezeiv/tools/btools.py

Property Changed:
----------------
    branches/soc-2008-unclezeiv/


Property changes on: branches/soc-2008-unclezeiv
___________________________________________________________________
Name: svn:ignore
   + user-config.py
.*
build
install


Modified: branches/soc-2008-unclezeiv/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/win32-vc-config.py	2008-10-04 09:03:45 UTC (rev 16912)
+++ branches/soc-2008-unclezeiv/config/win32-vc-config.py	2008-10-04 09:43:58 UTC (rev 16913)
@@ -5,7 +5,7 @@
 BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = 'false'  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -57,7 +57,7 @@
 BF_OPENEXR = LIBDIR + '/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 
@@ -96,7 +96,8 @@
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
-WITH_BF_GAMEENGINE = 'false'
+WITH_BF_GAMEENGINE = 'true'
+WITH_BF_PLAYER = 'true'
 
 WITH_BF_ODE = 'true'
 BF_ODE = LIBDIR + '/ode'
@@ -158,7 +159,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
 
 BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
@@ -171,17 +172,18 @@
 LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
 
 PLATFORM_LINKFLAGS = '''
-                        /SUBSYSTEM:CONSOLE 
-                        /MACHINE:IX86 
-                        /ENTRY:mainCRTStartup 
-                        /INCREMENTAL:NO 
-                        /NODEFAULTLIB:"msvcprt.lib" 
-                        /NODEFAULTLIB:"glut32.lib" 
-                        /NODEFAULTLIB:"libc.lib"
-                        /NODEFAULTLIB:"libcd.lib"
-                        /NODEFAULTLIB:"libcpd.lib" 
-                        /NODEFAULTLIB:"libcp.lib" 
-                    '''
-                        
+                       /SUBSYSTEM:CONSOLE
+                       /MACHINE:IX86
+                       /ENTRY:mainCRTStartup
+                       /INCREMENTAL:NO
+                       /NODEFAULTLIB:"msvcprt.lib"
+                       /NODEFAULTLIB:"glut32.lib"
+                       /NODEFAULTLIB:"libc.lib"
+                       /NODEFAULTLIB:"libcd.lib"
+                       /NODEFAULTLIB:"libcpd.lib"
+                       /NODEFAULTLIB:"libcp.lib"
+                       /LARGEADDRESSAWARE
+                   '''
+
 BF_BUILDDIR = '..\\build\\win32-vc'
 BF_INSTALLDIR='..\\install\\win32-vc'

Modified: branches/soc-2008-unclezeiv/extern/SConscript
===================================================================
--- branches/soc-2008-unclezeiv/extern/SConscript	2008-10-04 09:03:45 UTC (rev 16912)
+++ branches/soc-2008-unclezeiv/extern/SConscript	2008-10-04 09:43:58 UTC (rev 16913)
@@ -32,4 +32,5 @@
 if env['OURPLATFORM'] == 'linux2':
     SConscript(['binreloc/SConscript']);
 
-SConscript(['fftw/SConscript'])
+# FFTW not needed atm - dg
+# SConscript(['fftw/SConscript'])

Modified: branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-10-04 09:03:45 UTC (rev 16912)
+++ branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-10-04 09:43:58 UTC (rev 16913)
@@ -59,8 +59,10 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 
 XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
+XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
 XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
@@ -141,8 +143,10 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 
 XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
+XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
 XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
@@ -221,8 +225,10 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 
 XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
+XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
 XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
@@ -303,8 +309,10 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 
 XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
+XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
 XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision

Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/Bullet-C-Api.h	2008-10-04 09:03:45 UTC (rev 16912)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/Bullet-C-Api.h	2008-10-04 09:43:58 UTC (rev 16913)
@@ -1,175 +1,175 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-	Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's.
-	Work in progress, functionality will be added on demand.
-

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list