*msvc7 update

- added bullet files to project
- fixed compiler path on bBullet project

diff --git a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
index f0cd96247d288254db2176e1b1d12334a86bd9d8..60c6b02a92418df00991d8a1d0dafc12646fc164 100644 (file)
--- a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
@@ -716,9 +716,6 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h">
-                               </File>
                                <File
                                        RelativePath="..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.h">
                                </File>
@@ -796,6 +793,9 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.cpp">
                                        <FileConfiguration
@@ -904,6 +904,9 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.cpp">
                                        <FileConfiguration
@@ -931,6 +934,9 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.cpp">
                                        <FileConfiguration
@@ -985,6 +991,9 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.cpp">
                                        <FileConfiguration
@@ -1093,6 +1102,12 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.cpp">
                                        <FileConfiguration
@@ -1154,6 +1169,12 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\BoxShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\CollisionMargin.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.h">
                                </File>
@@ -1166,15 +1187,24 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.h">
                                </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\MultiSphereShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.h">
                                </File>
@@ -1190,6 +1220,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.h">
                                </File>

diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
index 082f502f5c0c8d531cac60fac5d174f53066a748..7b965fa771c945adfaf36914dfdfe30f5d3ed86e 100644 (file)
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="0"
                                UsePrecompiledHeader="2"
@@ -107,7 +107,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="0"
                                UsePrecompiledHeader="2"
@@ -151,7 +151,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -197,7 +197,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -242,7 +242,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+                               AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="2"