bullet + GE happy on msvc6 again :)

phew .. setting 'include pathes'  in VS6 is real pain

2 files changed, 89 insertions, 45 deletions

diff --git a/extern/bullet/Bullet/BLI_Bullet.dsp b/extern/bullet/Bullet/BLI_Bullet.dsp
index 0967a52e43b..8ff1dec014c 100644
--- a/extern/bullet/Bullet/BLI_Bullet.dsp
+++ b/extern/bullet/Bullet/BLI_Bullet.dsp
@@ -159,11 +159,7 @@ SOURCE=.\NarrowPhaseCollision\BU_VertexPoly.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\NarrowPhaseCollision\CollisionObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NarrowPhaseCollision\CollisionObject.h
+SOURCE=.\NarrowPhaseCollision\CollisionMargin.h
 # End Source File
 # Begin Source File
 
@@ -271,6 +267,14 @@ SOURCE=.\NarrowPhaseCollision\VoronoiSimplexSolver.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\BroadphaseCollision\AxisSweep3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BroadphaseCollision\AxisSweep3.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\BroadphaseCollision\BroadPhaseInterface.h
 # End Source File
 # Begin Source File
@@ -491,6 +495,14 @@ SOURCE=.\CollisionDispatch\CollisionDispatcher.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CollisionDispatch\CollisionObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionDispatch\CollisionObject.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CollisionDispatch\CollisionWorld.cpp
 # End Source File
 # Begin Source File
@@ -538,5 +550,49 @@ SOURCE=.\CollisionDispatch\UnionFind.cpp
 SOURCE=.\CollisionDispatch\UnionFind.h
 # End Source File
 # End Group
+# Begin Group "Extras"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_DynamicTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IMotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IMotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IPhysicsEnvironment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IPhysicsEnvironment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IVehicle.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_IVehicle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\Extras\PhysicsInterface\Common\PHY_Pro.h
+# End Source File
+# End Group
 # End Target
 # End Project
diff --git a/extern/bullet/BulletDynamics/BulletDynamics.dsp b/extern/bullet/BulletDynamics/BulletDynamics.dsp
index 1b9f9cc1985..2e13283b512 100644
--- a/extern/bullet/BulletDynamics/BulletDynamics.dsp
+++ b/extern/bullet/BulletDynamics/BulletDynamics.dsp
@@ -67,8 +67,8 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 LINK32=link.exe -lib
 MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -105,6 +105,14 @@ SOURCE=.\ConstraintSolver\ContactSolverInfo.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConstraintSolver\HingeConstraint.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ConstraintSolver\HingeConstraint.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ConstraintSolver\JacobianEntry.h
 # End Source File
 # Begin Source File
@@ -147,89 +155,69 @@ SOURCE=.\ConstraintSolver\SorLcp.cpp
 
 SOURCE=.\ConstraintSolver\SorLcp.h
 # End Source File
-# End Group
-# Begin Group "CollisionDispatch"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp
+SOURCE=.\ConstraintSolver\TypedConstraint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h
+SOURCE=.\ConstraintSolver\TypedConstraint.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\CollisionDispatch\ConvexConvexAlgorithm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CollisionDispatch\ConvexConvexAlgorithm.h
-# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Dynamics"
 
-SOURCE=.\CollisionDispatch\EmptyCollisionAlgorithm.cpp
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\EmptyCollisionAlgorithm.h
+SOURCE=.\Dynamics\BU_Joint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ManifoldResult.cpp
+SOURCE=.\Dynamics\BU_Joint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ManifoldResult.h
+SOURCE=.\Dynamics\ContactJoint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ToiContactDispatcher.cpp
+SOURCE=.\Dynamics\ContactJoint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\ToiContactDispatcher.h
+SOURCE=.\Dynamics\MassProps.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\UnionFind.cpp
+SOURCE=.\Dynamics\RigidBody.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\UnionFind.h
+SOURCE=.\Dynamics\RigidBody.h
 # End Source File
 # End Group
-# Begin Group "Dynamics"
+# Begin Group "Vehicle"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\Dynamics\BU_Joint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dynamics\BU_Joint.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dynamics\ContactJoint.cpp
+SOURCE=.\Vehicle\RaycastVehicle.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Dynamics\ContactJoint.h
+SOURCE=.\Vehicle\RaycastVehicle.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Dynamics\MassProps.h
+SOURCE=.\Vehicle\VehicleRaycaster.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Dynamics\RigidBody.cpp
+SOURCE=.\Vehicle\WheelInfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Dynamics\RigidBody.h
+SOURCE=.\Vehicle\WheelInfo.h
 # End Source File
 # End Group
 # End Target