msvc6 still builds :)

2 files changed, 110 insertions, 62 deletions

diff --git a/extern/bullet/Bullet/BLI_Bullet.dsp b/extern/bullet/Bullet/BLI_Bullet.dsp
index 8ff1dec014c..a7357ef7976 100644
--- a/extern/bullet/Bullet/BLI_Bullet.dsp
+++ b/extern/bullet/Bullet/BLI_Bullet.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-LINK32=link.exe -lib
 MTL=midl.exe
+LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /Zd /O2 /I "../LinearMath" /I "." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "BUM_INLINED" /D "USE_ALGEBRAIC" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,8 +70,8 @@ PostBuild_Cmds=XCOPY  /Y .\release\*.lib .\..\..\..\..\lib\windows\bullet\lib\*.
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-LINK32=link.exe -lib
 MTL=midl.exe
+LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "BUM_INLINED" /D "USE_ALGEBRAIC" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -303,6 +303,14 @@ SOURCE=.\BroadphaseCollision\Dispatcher.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\BroadphaseCollision\OverlappingPairCache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BroadphaseCollision\OverlappingPairCache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\BroadphaseCollision\SimpleBroadphase.cpp
 # End Source File
 # Begin Source File
@@ -343,6 +351,22 @@ SOURCE=.\CollisionShapes\CollisionShape.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CollisionShapes\CompoundShape.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionShapes\CompoundShape.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionShapes\ConcaveShape.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionShapes\ConcaveShape.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CollisionShapes\ConeShape.cpp
 # End Source File
 # Begin Source File
@@ -367,11 +391,11 @@ SOURCE=.\CollisionShapes\ConvexShape.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionShapes\ConvexTriangleCallback.cpp
+SOURCE=.\CollisionShapes\ConvexTriangleMeshShape.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionShapes\ConvexTriangleCallback.h
+SOURCE=.\CollisionShapes\ConvexTriangleMeshShape.h
 # End Source File
 # Begin Source File
 
@@ -439,6 +463,14 @@ SOURCE=.\CollisionShapes\SphereShape.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CollisionShapes\StaticPlaneShape.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionShapes\StaticPlaneShape.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CollisionShapes\StridingMeshInterface.cpp
 # End Source File
 # Begin Source File
@@ -487,6 +519,10 @@ SOURCE=.\CollisionShapes\TriangleShape.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\CollisionDispatch\CollisionCreateFunc.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CollisionDispatch\CollisionDispatcher.cpp
 # End Source File
 # Begin Source File
@@ -511,6 +547,14 @@ SOURCE=.\CollisionDispatch\CollisionWorld.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CollisionDispatch\CompoundCollisionAlgorithm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CollisionDispatch\CompoundCollisionAlgorithm.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp
 # End Source File
 # Begin Source File
@@ -543,56 +587,24 @@ SOURCE=.\CollisionDispatch\ManifoldResult.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CollisionDispatch\UnionFind.cpp
-# End Source File
-# Begin Source File
-
-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
+SOURCE=.\CollisionDispatch\SimulationIslandManager.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\Extras\PhysicsInterface\Common\PHY_IMotionState.cpp
+SOURCE=.\CollisionDispatch\SimulationIslandManager.h
 # 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
+SOURCE=.\CollisionDispatch\UnionFind.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\Extras\PhysicsInterface\Common\PHY_IVehicle.h
+SOURCE=.\CollisionDispatch\UnionFind.h
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "Extras"
 
-SOURCE=..\Extras\PhysicsInterface\Common\PHY_Pro.h
-# End Source File
+# PROP Default_Filter ""
 # End Group
 # End Target
 # End Project
diff --git a/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp b/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
index 2e13283b512..5ebbb63f2ae 100644
--- a/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
+++ b/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
@@ -8,12 +8,12 @@ CFG=BulletDynamics - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "BulletDynamics.mak".
+!MESSAGE NMAKE /f "BLI_BulletDynamics.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "BulletDynamics.mak" CFG="BulletDynamics - Win32 Debug"
+!MESSAGE NMAKE /f "BLI_BulletDynamics.mak" CFG="BulletDynamics - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "BulletDynamics___Win32_Release"
 # PROP Intermediate_Dir "BulletDynamics___Win32_Release"
 # PROP Target_Dir ""
-LINK32=link.exe -lib
 MTL=midl.exe
+LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /O2 /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -65,8 +65,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "BulletDynamics___Win32_Debug"
 # PROP Intermediate_Dir "BulletDynamics___Win32_Debug"
 # PROP Target_Dir ""
-LINK32=link.exe -lib
 MTL=midl.exe
+LINK32=link.exe -lib
 # 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"
@@ -105,23 +105,23 @@ SOURCE=.\ConstraintSolver\ContactSolverInfo.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\HingeConstraint.cpp
+SOURCE=.\ConstraintSolver\Generic6DofConstraint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\HingeConstraint.h
+SOURCE=.\ConstraintSolver\Generic6DofConstraint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\JacobianEntry.h
+SOURCE=.\ConstraintSolver\HingeConstraint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\OdeConstraintSolver.cpp
+SOURCE=.\ConstraintSolver\HingeConstraint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\OdeConstraintSolver.h
+SOURCE=.\ConstraintSolver\JacobianEntry.h
 # End Source File
 # Begin Source File
 
@@ -133,11 +133,11 @@ SOURCE=.\ConstraintSolver\Point2PointConstraint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\SimpleConstraintSolver.cpp
+SOURCE=.\ConstraintSolver\SequentialImpulseConstraintSolver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\SimpleConstraintSolver.h
+SOURCE=.\ConstraintSolver\SequentialImpulseConstraintSolver.h
 # End Source File
 # Begin Source File
 
@@ -149,14 +149,6 @@ SOURCE=.\ConstraintSolver\Solve2LinearConstraint.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ConstraintSolver\SorLcp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ConstraintSolver\SorLcp.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\ConstraintSolver\TypedConstraint.cpp
 # End Source File
 # Begin Source File
@@ -220,5 +212,49 @@ SOURCE=.\Vehicle\WheelInfo.cpp
 SOURCE=.\Vehicle\WheelInfo.h
 # End Source File
 # End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_DynamicTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IMotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IMotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IVehicle.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IVehicle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_Pro.h
+# End Source File
+# End Group
 # End Target
 # End Project