diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj')
-rw-r--r-- | extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj | 324 |
1 files changed, 321 insertions, 3 deletions
diff --git a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj index 87a1e4546d1..a97f8acb7bb 100644 --- a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj +++ b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj @@ -53,19 +53,23 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include +XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle @@ -133,19 +137,23 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include +XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle @@ -211,19 +219,23 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include +XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle @@ -291,19 +303,23 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include +XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes +XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle @@ -340,6 +356,9 @@ ECHO Done <File RelativePath="..\..\src\btBulletDynamicsCommon.h"> </File> + <File + RelativePath="..\..\src\Bullet-C-Api.h"> + </File> <Filter Name="BulletDynamics" Filter=""> @@ -392,12 +411,24 @@ ECHO Done RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h"> </File> <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSliderConstraint.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSliderConstraint.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp"> </File> <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h"> </File> <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverBody.h"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp"> </File> <File @@ -408,6 +439,12 @@ ECHO Done Name="Dynamics" Filter=""> <File + RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.cpp"> + </File> + <File + RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.h"> + </File> + <File RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp"> </File> <File @@ -428,6 +465,9 @@ ECHO Done <File RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h"> </File> + <File + RelativePath="..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp"> + </File> </Filter> <Filter Name="Vehicle" @@ -477,18 +517,45 @@ ECHO Done RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvt.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvt.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDbvtBroadphase.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.h"> </File> <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCallback.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btQuantizedBvh.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp"> </File> <File @@ -529,6 +596,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h"> </File> <File + RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp"> </File> <File @@ -584,6 +657,21 @@ ECHO Done Name="CollisionDispatch" Filter=""> <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h"> </File> <File @@ -623,6 +711,18 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp"> </File> <File @@ -726,6 +826,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp"> </File> <File @@ -756,12 +862,21 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMaterial.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp"> </File> <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btMultiSphereShape.cpp"> </File> <File @@ -780,6 +895,18 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btShapeHull.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btShapeHull.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btSphereShape.cpp"> </File> <File @@ -822,6 +949,12 @@ ECHO Done RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.h"> </File> <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.h"> + </File> + <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleMesh.cpp"> </File> <File @@ -836,6 +969,130 @@ ECHO Done <File RelativePath="..\..\src\BulletCollision\CollisionShapes\btTriangleShape.h"> </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h"> + </File> + </Filter> + <Filter + Name="Gimpact" + Filter=""> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btBoxCollision.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btClipPolygon.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGeometryOperations.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactMassUtil.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btQuantization.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_array.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_basic_geometry_operations.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_bitset.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_collision.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_clip_polygon.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_geom_types.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_geometry.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_hash_table.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_linear_math.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_math.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_radixsort.h"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp"> + </File> + <File + RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.h"> + </File> </Filter> </Filter> <Filter @@ -854,6 +1111,12 @@ ECHO Done RelativePath="..\..\src\LinearMath\btAlignedObjectArray.h"> </File> <File + RelativePath="..\..\src\LinearMath\btConvexHull.cpp"> + </File> + <File + RelativePath="..\..\src\LinearMath\btConvexHull.h"> + </File> + <File RelativePath="..\..\src\LinearMath\btDefaultMotionState.h"> </File> <File @@ -863,6 +1126,9 @@ ECHO Done RelativePath="..\..\src\LinearMath\btGeometryUtil.h"> </File> <File + RelativePath="..\..\src\LinearMath\btHashMap.h"> + </File> + <File RelativePath="..\..\src\LinearMath\btIDebugDraw.h"> </File> <File @@ -881,6 +1147,9 @@ ECHO Done RelativePath="..\..\src\LinearMath\btPoint3.h"> </File> <File + RelativePath="..\..\src\LinearMath\btPoolAllocator.h"> + </File> + <File RelativePath="..\..\src\LinearMath\btQuadWord.h"> </File> <File @@ -899,9 +1168,6 @@ ECHO Done RelativePath="..\..\src\LinearMath\btScalar.h"> </File> <File - RelativePath="..\..\src\LinearMath\btSimdMinMax.h"> - </File> - <File RelativePath="..\..\src\LinearMath\btStackAlloc.h"> </File> <File @@ -914,6 +1180,58 @@ ECHO Done RelativePath="..\..\src\LinearMath\btVector3.h"> </File> </Filter> + <Filter + Name="BulletSoftBody" + Filter=""> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBody.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBody.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyHelpers.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyHelpers.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyInternals.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftRigidDynamicsWorld.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftRigidDynamicsWorld.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftSoftCollisionAlgorithm.cpp"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSoftSoftCollisionAlgorithm.h"> + </File> + <File + RelativePath="..\..\src\BulletSoftBody\btSparseSDF.h"> + </File> + </Filter> </Filter> </Files> <Globals> |