Update to the VC7 projectfiles.

This should bring the projectfiles upto date for msvc7.

Moving these to version 7.1 so that the version 8 people don't have such a hard time importing into 2005.

Build intern.sln, extern.sln and then blender.sln. Enjoy. :p

2 files changed, 141 insertions, 211 deletions

diff --git a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
index 60c6b02a924..a7782f71d55 100644
--- a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="Bullet3ContinuousCollision"
 	ProjectGUID="{FFD3C64A-30E2-4BC7-BC8F-51818C320400}"
 	SccProjectName=""
@@ -50,11 +50,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -116,11 +118,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -180,11 +184,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -246,11 +252,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -272,7 +280,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="NarrowPhaseCollision"
@@ -717,6 +726,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.h">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.h">
 				</File>
 				<File
@@ -1241,6 +1253,9 @@ ECHO Done
 				Name="Source Files"
 				Filter="">
 				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseProxy.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
@@ -1295,31 +1310,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionDispatcher.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
+					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
@@ -1353,6 +1344,9 @@ ECHO Done
 				Name="Header Files"
 				Filter="">
 				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.h">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseInterface.h">
 				</File>
 				<File
@@ -1362,7 +1356,7 @@ ECHO Done
 					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.h">
 				</File>
 				<File
-					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionDispatcher.h">
+					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
@@ -1416,6 +1410,90 @@ ECHO Done
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="CollisionDispatch"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.cpp">
+					<FileConfiguration
+						Name="Blender Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Blender Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.h">
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
index 7f35ad4b2e5..91f6d504e70 100644
--- a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="Bullet3Dynamics"
 	ProjectGUID="{3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}"
 	Keyword="Win32Proj">
@@ -46,11 +46,14 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
+
 
 ECHO Done
 "/>
@@ -102,12 +105,12 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
-XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
-
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 ECHO Done
 "/>
 			<Tool
@@ -161,11 +164,13 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 ECHO Done
 "/>
@@ -217,11 +222,13 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 ECHO Done
 "/>
@@ -241,7 +248,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="ConstraintSolver"
@@ -277,6 +285,9 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
+				</File>
+				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
@@ -411,6 +422,9 @@ ECHO Done
 							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp">
+				</File>
 			</Filter>
 			<Filter
 				Name="Header Files"
@@ -442,97 +456,19 @@ ECHO Done
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.h">
 				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="CollisionDispatch"
+			Name="Dynamics"
 			Filter="">
 			<Filter
 				Name="Source Files"
 				Filter="">
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConvexAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ManifoldResult.cpp">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\BU_Joint.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
 						<Tool
@@ -559,7 +495,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ToiContactDispatcher.cpp">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\ContactJoint.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
 						<Tool
@@ -586,7 +522,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\UnionFind.cpp">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\RigidBody.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
 						<Tool
@@ -617,127 +553,43 @@ ECHO Done
 				Name="Header Files"
 				Filter="">
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConvexAlgorithm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\EmptyCollisionAlgorithm.h">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\BU_Joint.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ManifoldResult.h">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\ContactJoint.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ToiContactDispatcher.h">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\MassProps.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\UnionFind.h">
+					RelativePath="..\..\..\BulletDynamics\Dynamics\RigidBody.h">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Dynamics"
+			Name="Vehicle"
 			Filter="">
 			<Filter
 				Name="Source Files"
 				Filter="">
 				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\BU_Joint.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
+					RelativePath="..\..\..\BulletDynamics\Vehicle\RaycastVehicle.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\ContactJoint.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\RigidBody.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
+					RelativePath="..\..\..\BulletDynamics\Vehicle\WheelInfo.cpp">
 				</File>
 			</Filter>
 			<Filter
 				Name="Header Files"
 				Filter="">
 				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\BU_Joint.h">
+					RelativePath="..\..\..\BulletDynamics\Vehicle\RaycastVehicle.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\ContactJoint.h">
+					RelativePath="..\..\..\BulletDynamics\Vehicle\VehicleRaycaster.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\MassProps.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\Dynamics\RigidBody.h">
+					RelativePath="..\..\..\BulletDynamics\Vehicle\WheelInfo.h">
 				</File>
 			</Filter>
 		</Filter>