==== MSVC 7 project files ===

maintenance work:
- added missing files in blenkernel
- updated Bullet in extern
- Python: SurfNurb.c
- removed compile and dependency of PHY_Ode
- made blenderplayer compile again (had to add pthreads lib)

2 files changed, 38 insertions, 86 deletions

diff --git a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
index 7bd6d7bb0c7..e4efb3419b8 100644
--- a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
@@ -836,6 +836,12 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
@@ -917,7 +923,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.cpp">
+					RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.cpp">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.cpp">
@@ -1088,6 +1094,9 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
@@ -1191,6 +1200,12 @@ ECHO Done
 					RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.h">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.h">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
 				</File>
 				<File
@@ -1200,7 +1215,7 @@ ECHO Done
 					RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.h">
 				</File>
 				<File
-					RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.h">
+					RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.h">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.h">
@@ -1227,6 +1242,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.h">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
 				</File>
 				<File
@@ -1313,6 +1331,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\OverlappingPairCache.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
 					<FileConfiguration
 						Name="Blender Debug|Win32">
@@ -1359,6 +1380,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\OverlappingPairCache.h">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
 				</File>
 			</Filter>
@@ -1453,6 +1477,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CompoundCollisionAlgorithm.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
 				</File>
 				<File
@@ -1465,6 +1492,9 @@ ECHO Done
 					RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
 				</File>
 				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\SimulationIslandManager.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
 				</File>
 			</Filter>
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 fddaff5b675..7f20dc3fa20 100644
--- a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
@@ -286,34 +286,10 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.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\ConstraintSolver\HingeConstraint.cpp">
 				</File>
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp">
@@ -343,31 +319,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.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\ConstraintSolver\SequentialImpulseConstraintSolver.cpp">
 				</File>
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp">
@@ -397,33 +349,6 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.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\ConstraintSolver\TypedConstraint.cpp">
 				</File>
 			</Filter>
@@ -440,24 +365,21 @@ ECHO Done
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h">
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
 				</File>
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h">
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.h">
 				</File>
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h">
 				</File>
 				<File
-					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.h">
-				</File>
-				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
 				</File>
 			</Filter>