diff --git a/Bullet/CMakeLists.txt b/Bullet/CMakeLists.txt deleted file mode 100644 index c1f50a006..000000000 --- a/Bullet/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ - -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } -) - -ADD_LIBRARY(LibBulletCollision - BroadphaseCollision/AxisSweep3.cpp - BroadphaseCollision/BroadphaseProxy.cpp - BroadphaseCollision/CollisionAlgorithm.cpp - BroadphaseCollision/Dispatcher.cpp - BroadphaseCollision/OverlappingPairCache.cpp - BroadphaseCollision/SimpleBroadphase.cpp - CollisionDispatch/CollisionDispatcher.cpp - CollisionDispatch/CollisionObject.cpp - CollisionDispatch/CollisionWorld.cpp - CollisionDispatch/CompoundCollisionAlgorithm.cpp - CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp - CollisionDispatch/SphereSphereCollisionAlgorithm.cpp - CollisionDispatch/ConvexConvexAlgorithm.cpp - CollisionDispatch/EmptyCollisionAlgorithm.cpp - CollisionDispatch/ManifoldResult.cpp - CollisionDispatch/SimulationIslandManager.cpp - CollisionDispatch/UnionFind.cpp - CollisionShapes/BoxShape.cpp - CollisionShapes/BvhTriangleMeshShape.cpp - CollisionShapes/CollisionShape.cpp - CollisionShapes/CompoundShape.cpp - CollisionShapes/ConcaveShape.cpp - CollisionShapes/ConeShape.cpp - CollisionShapes/ConvexHullShape.cpp - CollisionShapes/ConvexShape.cpp - CollisionShapes/ConvexTriangleMeshShape.cpp - CollisionShapes/CylinderShape.cpp - CollisionShapes/EmptyShape.cpp - CollisionShapes/MinkowskiSumShape.cpp - CollisionShapes/MultiSphereShape.cpp - CollisionShapes/OptimizedBvh.cpp - CollisionShapes/PolyhedralConvexShape.cpp - CollisionShapes/Simplex1to4Shape.cpp - CollisionShapes/SphereShape.cpp - CollisionShapes/StaticPlaneShape.cpp - CollisionShapes/StridingMeshInterface.cpp - CollisionShapes/TriangleCallback.cpp - CollisionShapes/TriangleIndexVertexArray.cpp - CollisionShapes/TriangleMesh.cpp - CollisionShapes/TriangleMeshShape.cpp - NarrowPhaseCollision/ContinuousConvexCollision.cpp - NarrowPhaseCollision/ConvexCast.cpp - NarrowPhaseCollision/GjkConvexCast.cpp - NarrowPhaseCollision/GjkPairDetector.cpp - NarrowPhaseCollision/Hull.cpp - NarrowPhaseCollision/ManifoldContactAddResult.cpp - NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp - NarrowPhaseCollision/PersistentManifold.cpp - NarrowPhaseCollision/RaycastCallback.cpp - NarrowPhaseCollision/Shape.cpp - NarrowPhaseCollision/SubSimplexConvexCast.cpp - NarrowPhaseCollision/VoronoiSimplexSolver.cpp -) diff --git a/Bullet/NarrowPhaseCollision/CollisionMargin.h b/Bullet/NarrowPhaseCollision/CollisionMargin.h deleted file mode 100644 index 377f0e506..000000000 --- a/Bullet/NarrowPhaseCollision/CollisionMargin.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef COLLISION_MARGIN_H -#define COLLISION_MARGIN_H - -//used by Gjk and some other algorithms - -#define CONVEX_DISTANCE_MARGIN 0.04f// 0.1f//;//0.01f - - - -#endif //COLLISION_MARGIN_H - diff --git a/BulletDynamics/CMakeLists.txt b/BulletDynamics/CMakeLists.txt deleted file mode 100644 index cb1f74bb6..000000000 --- a/BulletDynamics/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics } -) - -ADD_LIBRARY(LibBulletDynamics - - ConstraintSolver/ContactConstraint.cpp - ConstraintSolver/Generic6DofConstraint.cpp - ConstraintSolver/HingeConstraint.cpp - ConstraintSolver/Point2PointConstraint.cpp - ConstraintSolver/SequentialImpulseConstraintSolver.cpp - ConstraintSolver/Solve2LinearConstraint.cpp - ConstraintSolver/TypedConstraint.cpp - Dynamics/BU_Joint.cpp - Dynamics/ContactJoint.cpp - Dynamics/RigidBody.cpp - Vehicle/RaycastVehicle.cpp - Vehicle/WheelInfo.cpp -) \ No newline at end of file diff --git a/BulletDynamics/Dynamics/BU_Joint.cpp b/BulletDynamics/Dynamics/BU_Joint.cpp deleted file mode 100644 index ab2a75570..000000000 --- a/BulletDynamics/Dynamics/BU_Joint.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BU_Joint.h" - -BU_Joint::BU_Joint() -{ - -} -BU_Joint::~BU_Joint() -{ - -} diff --git a/BulletDynamics/Dynamics/BU_Joint.h b/BulletDynamics/Dynamics/BU_Joint.h deleted file mode 100644 index 5c790bd02..000000000 --- a/BulletDynamics/Dynamics/BU_Joint.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BU_Joint_H -#define BU_Joint_H - -class RigidBody; -class BU_Joint; -#include "SimdScalar.h" - -struct BU_ContactJointNode { - BU_Joint *joint; // pointer to enclosing BU_Joint object - RigidBody*body; // *other* body this joint is connected to -}; -typedef SimdScalar dVector3[4]; - - -class BU_Joint { - -public: - // naming convention: the "first" body this is connected to is node[0].body, - // and the "second" body is node[1].body. if this joint is only connected - // to one body then the second body is 0. - - // info returned by getInfo1 function. the constraint dimension is m (<=6). - // i.e. that is the total number of rows in the jacobian. `nub' is the - // number of unbounded variables (which have lo,hi = -/+ infinity). - - BU_Joint(); - virtual ~BU_Joint(); - - - struct Info1 { - int m,nub; - }; - - // info returned by getInfo2 function - - struct Info2 { - // integrator parameters: frames per second (1/stepsize), default error - // reduction parameter (0..1). - SimdScalar fps,erp; - - // for the first and second body, pointers to two (linear and angular) - // n*3 jacobian sub matrices, stored by rows. these matrices will have - // been initialized to 0 on entry. if the second body is zero then the - // J2xx pointers may be 0. - SimdScalar *J1l,*J1a,*J2l,*J2a; - - // elements to jump from one row to the next in J's - int rowskip; - - // right hand sides of the equation J*v = c + cfm * lambda. cfm is the - // "constraint force mixing" vector. c is set to zero on entry, cfm is - // set to a constant value (typically very small or zero) value on entry. - SimdScalar *c,*cfm; - - // lo and hi limits for variables (set to -/+ infinity on entry). - SimdScalar *lo,*hi; - - // findex vector for variables. see the LCP solver interface for a - // description of what this does. this is set to -1 on entry. - // note that the returned indexes are relative to the first index of - // the constraint. - int *findex; - }; - - // virtual function table: size of the joint structure, function pointers. - // we do it this way instead of using C++ virtual functions because - // sometimes we need to allocate joints ourself within a memory pool. - - virtual void GetInfo1 (Info1 *info)=0; - virtual void GetInfo2 (Info2 *info)=0; - - int flags; // dJOINT_xxx flags - BU_ContactJointNode node[2]; // connections to bodies. node[1].body can be 0 - SimdScalar lambda[6]; // lambda generated by last step -}; - - -#endif //BU_Joint_H diff --git a/BulletDynamics/Dynamics/ContactJoint.cpp b/BulletDynamics/Dynamics/ContactJoint.cpp deleted file mode 100644 index cab71449f..000000000 --- a/BulletDynamics/Dynamics/ContactJoint.cpp +++ /dev/null @@ -1,270 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ -#include "ContactJoint.h" -#include "RigidBody.h" -#include "NarrowPhaseCollision/PersistentManifold.h" - - -//this constant needs to be set up so different solvers give 'similar' results -#define FRICTION_CONSTANT 120.f - - -ContactJoint::ContactJoint(PersistentManifold* manifold,int index,bool swap,RigidBody* body0,RigidBody* body1) -:m_manifold(manifold), -m_index(index), -m_swapBodies(swap), -m_body0(body0), -m_body1(body1) -{ -} - -int m_numRows = 3; - - -void ContactJoint::GetInfo1(Info1 *info) -{ - info->m = m_numRows; - //friction adds another 2... - - info->nub = 0; -} - -#define dCROSS(a,op,b,c) \ - (a)[0] op ((b)[1]*(c)[2] - (b)[2]*(c)[1]); \ - (a)[1] op ((b)[2]*(c)[0] - (b)[0]*(c)[2]); \ - (a)[2] op ((b)[0]*(c)[1] - (b)[1]*(c)[0]); - -#define M_SQRT12 SimdScalar(0.7071067811865475244008443621048490) - -#define dRecipSqrt(x) ((float)(1.0f/SimdSqrt(float(x)))) /* reciprocal square root */ - - - -void dPlaneSpace1 (const dVector3 n, dVector3 p, dVector3 q) -{ - if (SimdFabs(n[2]) > M_SQRT12) { - // choose p in y-z plane - SimdScalar a = n[1]*n[1] + n[2]*n[2]; - SimdScalar k = dRecipSqrt (a); - p[0] = 0; - p[1] = -n[2]*k; - p[2] = n[1]*k; - // set q = n x p - q[0] = a*k; - q[1] = -n[0]*p[2]; - q[2] = n[0]*p[1]; - } - else { - // choose p in x-y plane - SimdScalar a = n[0]*n[0] + n[1]*n[1]; - SimdScalar k = dRecipSqrt (a); - p[0] = -n[1]*k; - p[1] = n[0]*k; - p[2] = 0; - // set q = n x p - q[0] = -n[2]*p[1]; - q[1] = n[2]*p[0]; - q[2] = a*k; - } -} - - - -void ContactJoint::GetInfo2(Info2 *info) -{ - - int s = info->rowskip; - int s2 = 2*s; - - float swapFactor = m_swapBodies ? -1.f : 1.f; - - // get normal, with sign adjusted for body1/body2 polarity - dVector3 normal; - - - ManifoldPoint& point = m_manifold->GetContactPoint(m_index); - - normal[0] = swapFactor*point.m_normalWorldOnB[0]; - normal[1] = swapFactor*point.m_normalWorldOnB[1]; - normal[2] = swapFactor*point.m_normalWorldOnB[2]; - normal[3] = 0; // @@@ hmmm - - // if (GetBody0()) - SimdVector3 relativePositionA; - { - relativePositionA = point.GetPositionWorldOnA() - m_body0->getCenterOfMassPosition(); - dVector3 c1; - c1[0] = relativePositionA[0]; - c1[1] = relativePositionA[1]; - c1[2] = relativePositionA[2]; - - // set jacobian for normal - info->J1l[0] = normal[0]; - info->J1l[1] = normal[1]; - info->J1l[2] = normal[2]; - dCROSS (info->J1a,=,c1,normal); - - } - // if (GetBody1()) - SimdVector3 relativePositionB; - { - dVector3 c2; - relativePositionB = point.GetPositionWorldOnB() - m_body1->getCenterOfMassPosition(); - - // for (i=0; i<3; i++) c2[i] = j->contact.geom.pos[i] - - // j->node[1].body->pos[i]; - c2[0] = relativePositionB[0]; - c2[1] = relativePositionB[1]; - c2[2] = relativePositionB[2]; - - info->J2l[0] = -normal[0]; - info->J2l[1] = -normal[1]; - info->J2l[2] = -normal[2]; - dCROSS (info->J2a,= -,c2,normal); - } - - SimdScalar k = info->fps * info->erp; - - float depth = -point.GetDistance(); -// if (depth < 0.f) -// depth = 0.f; - - info->c[0] = k * depth; - //float maxvel = .2f; - -// if (info->c[0] > maxvel) -// info->c[0] = maxvel; - - - //can override it, not necessary -// info->cfm[0] = 0.f; -// info->cfm[1] = 0.f; -// info->cfm[2] = 0.f; - - - - // set LCP limits for normal - info->lo[0] = 0; - info->hi[0] = 1e30f;//dInfinity; - info->lo[1] = 0; - info->hi[1] = 0.f; - info->lo[2] = 0.f; - info->hi[2] = 0.f; - -#define DO_THE_FRICTION_2 -#ifdef DO_THE_FRICTION_2 - // now do jacobian for tangential forces - dVector3 t1,t2; // two vectors tangential to normal - - dVector3 c1; - c1[0] = relativePositionA[0]; - c1[1] = relativePositionA[1]; - c1[2] = relativePositionA[2]; - - dVector3 c2; - c2[0] = relativePositionB[0]; - c2[1] = relativePositionB[1]; - c2[2] = relativePositionB[2]; - - //combined friction is available in the contact point - float friction = FRICTION_CONSTANT*m_body0->getFriction() * m_body1->getFriction(); - - // first friction direction - if (m_numRows >= 2) - { - - - - dPlaneSpace1 (normal,t1,t2); - - info->J1l[s+0] = t1[0]; - info->J1l[s+1] = t1[1]; - info->J1l[s+2] = t1[2]; - dCROSS (info->J1a+s,=,c1,t1); - if (1) { //j->node[1].body) { - info->J2l[s+0] = -t1[0]; - info->J2l[s+1] = -t1[1]; - info->J2l[s+2] = -t1[2]; - dCROSS (info->J2a+s,= -,c2,t1); - } - // set right hand side - if (0) {//j->contact.surface.mode & dContactMotion1) { - //info->c[1] = j->contact.surface.motion1; - } - // set LCP bounds and friction index. this depends on the approximation - // mode - //1e30f - - - info->lo[1] = -friction;//-j->contact.surface.mu; - info->hi[1] = friction;//j->contact.surface.mu; - if (1)//j->contact.surface.mode & dContactApprox1_1) - info->findex[1] = 0; - - // set slip (constraint force mixing) - if (0)//j->contact.surface.mode & dContactSlip1) - { - // info->cfm[1] = j->contact.surface.slip1; - } else - { - //info->cfm[1] = 0.f; - } - } - - // second friction direction - if (m_numRows >= 3) { - info->J1l[s2+0] = t2[0]; - info->J1l[s2+1] = t2[1]; - info->J1l[s2+2] = t2[2]; - dCROSS (info->J1a+s2,=,c1,t2); - if (1) { //j->node[1].body) { - info->J2l[s2+0] = -t2[0]; - info->J2l[s2+1] = -t2[1]; - info->J2l[s2+2] = -t2[2]; - dCROSS (info->J2a+s2,= -,c2,t2); - } - - // set right hand side - if (0){//j->contact.surface.mode & dContactMotion2) { - //info->c[2] = j->contact.surface.motion2; - } - // set LCP bounds and friction index. this depends on the approximation - // mode - if (0){//j->contact.surface.mode & dContactMu2) { - //info->lo[2] = -j->contact.surface.mu2; - //info->hi[2] = j->contact.surface.mu2; - } - else { - info->lo[2] = -friction; - info->hi[2] = friction; - } - if (0)//j->contact.surface.mode & dContactApprox1_2) - - { - info->findex[2] = 0; - } - // set slip (constraint force mixing) - if (0) //j->contact.surface.mode & dContactSlip2) - - { - //info->cfm[2] = j->contact.surface.slip2; - - } - } - -#endif //DO_THE_FRICTION_2 - -} - diff --git a/BulletDynamics/Dynamics/ContactJoint.h b/BulletDynamics/Dynamics/ContactJoint.h deleted file mode 100644 index f8727d937..000000000 --- a/BulletDynamics/Dynamics/ContactJoint.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef CONTACT_JOINT_H -#define CONTACT_JOINT_H - -#include "BU_Joint.h" -class RigidBody; -class PersistentManifold; - -class ContactJoint : public BU_Joint -{ - PersistentManifold* m_manifold; - int m_index; - bool m_swapBodies; - RigidBody* m_body0; - RigidBody* m_body1; - - -public: - - ContactJoint() {}; - - ContactJoint(PersistentManifold* manifold,int index,bool swap,RigidBody* body0,RigidBody* body1); - - //BU_Joint interface for solver - - virtual void GetInfo1(Info1 *info); - - virtual void GetInfo2(Info2 *info); - - - - -}; - -#endif //CONTACT_JOINT_H - diff --git a/CMakeLists.txt b/CMakeLists.txt index 937b5eecc..d300ed082 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,3 @@ PROJECT(BULLET_PHYSICS) -SUBDIRS(LinearMath Bullet BulletDynamics Demos Extras) +SUBDIRS(src Demos Extras) diff --git a/Demos/BspDemo/BspConverter.cpp b/Demos/BspDemo/BspConverter.cpp index dc08efb97..05a60049a 100644 --- a/Demos/BspDemo/BspConverter.cpp +++ b/Demos/BspDemo/BspConverter.cpp @@ -16,7 +16,7 @@ subject to the following restrictions: #include "BspConverter.h" #include "BspLoader.h" #include "CcdPhysicsEnvironment.h" -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" void BspConverter::convertBsp(BspLoader& bspLoader,float scaling) { @@ -86,7 +86,7 @@ void BspConverter::convertBsp(BspLoader& bspLoader,float scaling) std::vector vertices; getVerticesFromPlaneEquations(planeEquations,vertices); - printf("getVerticesFromPlaneEquations returned %i\n",vertices.size()); + printf("getVerticesFromPlaneEquations returned %i\n",(int)vertices.size()); bool isEntity = false; SimdVector3 entityTarget(0.f,0.f,0.f); diff --git a/Demos/BspDemo/BspConverter.h b/Demos/BspDemo/BspConverter.h index bb7cae470..dc9e99981 100644 --- a/Demos/BspDemo/BspConverter.h +++ b/Demos/BspDemo/BspConverter.h @@ -18,7 +18,7 @@ subject to the following restrictions: class BspLoader; #include -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" ///BspConverter turns a loaded bsp level into convex parts (vertices) class BspConverter @@ -26,7 +26,9 @@ class BspConverter public: void convertBsp(BspLoader& bspLoader,float scaling); - + virtual ~BspConverter() + { + } ///Utility function to create vertices from a Quake Brush. Brute force but it works. ///Bit overkill to use QHull package void getVerticesFromPlaneEquations(const std::vector& planeEquations , std::vector& verticesOut ); diff --git a/Demos/BspDemo/BspDemo.cpp b/Demos/BspDemo/BspDemo.cpp index caec6c2be..957a70609 100644 --- a/Demos/BspDemo/BspDemo.cpp +++ b/Demos/BspDemo/BspDemo.cpp @@ -16,33 +16,10 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" -//#include "GL_LineSegmentShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/CylinderShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/StaticPlaneShape.h" -#include "CollisionShapes/ConvexHullShape.h" -#include "CollisionShapes/TriangleMesh.h" -#include "CollisionShapes/ConvexTriangleMeshShape.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/CompoundShape.h" +#include "btBulletDynamicsCommon.h" - - -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" - -#include "Dynamics/RigidBody.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" - -#include "quickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" diff --git a/Demos/BspDemo/CMakeLists.txt b/Demos/BspDemo/CMakeLists.txt index b579baa34..7b35903c1 100644 --- a/Demos/BspDemo/CMakeLists.txt +++ b/Demos/BspDemo/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt index 14020278c..bf3718e63 100644 --- a/Demos/CcdPhysicsDemo/CMakeLists.txt +++ b/Demos/CcdPhysicsDemo/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index 507867ab7..b71d89ebb 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -21,36 +21,17 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "ParallelPhysicsEnvironment.h" +#include "btBulletDynamicsCommon.h" + #include "CcdPhysicsController.h" #include "MyMotionState.h" -//#include "GL_LineSegmentShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/StaticPlaneShape.h" -#include "CollisionShapes/CompoundShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" -#include "ConstraintSolver/SequentialImpulseConstraintSolver.h" -#include "Dynamics/RigidBody.h" -#include "CollisionDispatch/CollisionDispatcher.h" #include "ParallelIslandDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" - -#include "quickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" -#include "CollisionDispatch/SphereSphereCollisionAlgorithm.h" diff --git a/Demos/CcdPhysicsDemo/MyMotionState.cpp b/Demos/CcdPhysicsDemo/MyMotionState.cpp index 956aac1ec..4699dd718 100644 --- a/Demos/CcdPhysicsDemo/MyMotionState.cpp +++ b/Demos/CcdPhysicsDemo/MyMotionState.cpp @@ -14,7 +14,7 @@ subject to the following restrictions: */ #include "MyMotionState.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdPoint3.h" MyMotionState::MyMotionState() { diff --git a/Demos/CcdPhysicsDemo/MyMotionState.h b/Demos/CcdPhysicsDemo/MyMotionState.h index e1adb2bfa..cbf9988e2 100644 --- a/Demos/CcdPhysicsDemo/MyMotionState.h +++ b/Demos/CcdPhysicsDemo/MyMotionState.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define MY_MOTIONSTATE_H #include "PHY_IMotionState.h" -#include +#include class MyMotionState : public PHY_IMotionState diff --git a/Demos/ColladaDemo/CMakeLists.txt b/Demos/ColladaDemo/CMakeLists.txt index a1f7ece9e..394ee6bfb 100644 --- a/Demos/ColladaDemo/CMakeLists.txt +++ b/Demos/ColladaDemo/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/ColladaDemo/ColladaConverter.cpp b/Demos/ColladaDemo/ColladaConverter.cpp index 95a68785a..a3c9247d4 100644 --- a/Demos/ColladaDemo/ColladaConverter.cpp +++ b/Demos/ColladaDemo/ColladaConverter.cpp @@ -18,17 +18,17 @@ subject to the following restrictions: #include "dae.h" #include "dom/domCOLLADA.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/CylinderShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/StaticPlaneShape.h" -#include "CollisionShapes/ConvexHullShape.h" -#include "CollisionShapes/TriangleMesh.h" -#include "CollisionShapes/ConvexTriangleMeshShape.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/CompoundShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btCylinderShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" +#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h" +#include "BulletCollision/CollisionShapes/btConvexHullShape.h" +#include "BulletCollision/CollisionShapes/btTriangleMesh.h" +#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" +#include "BulletCollision/CollisionShapes/btCompoundShape.h" #include "CcdPhysicsController.h" diff --git a/Demos/ColladaDemo/ColladaConverter.h b/Demos/ColladaDemo/ColladaConverter.h index 272b65e58..33526e90b 100644 --- a/Demos/ColladaDemo/ColladaConverter.h +++ b/Demos/ColladaDemo/ColladaConverter.h @@ -18,8 +18,8 @@ subject to the following restrictions: #ifndef COLLADA_CONVERTER_H #define COLLADA_CONVERTER_H -#include "SimdTransform.h" -#include "SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdVector3.h" class CollisionShape; class PHY_IPhysicsController; diff --git a/Demos/ColladaDemo/ColladaDemo.cpp b/Demos/ColladaDemo/ColladaDemo.cpp index d54c5189a..6e07c531e 100644 --- a/Demos/ColladaDemo/ColladaDemo.cpp +++ b/Demos/ColladaDemo/ColladaDemo.cpp @@ -15,19 +15,13 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" -#include "Dynamics/RigidBody.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" -#include "quickprof.h" -#include "IDebugDraw.h" +#include "btBulletDynamicsCommon.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" + //COLLADA_DOM and LibXML source code are included in Extras/ folder. //COLLADA_DOM should compile under all platforms, and is enabled by default. diff --git a/Demos/CollisionDemo/CollisionDemo.cpp b/Demos/CollisionDemo/CollisionDemo.cpp index 51a8f6f3b..ee4cc9323 100644 --- a/Demos/CollisionDemo/CollisionDemo.cpp +++ b/Demos/CollisionDemo/CollisionDemo.cpp @@ -19,21 +19,23 @@ subject to the following restrictions: /// See the define CATCH_DEGENERATE_TETRAHEDRON in Bullet's VoronoiSimplexSolver.cpp /// -#include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionShapes/BoxShape.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "NarrowPhaseCollision/PointCollector.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +///This low-level internal demo does intentionally NOT use the btBulletCollisionCommon.h header +///It needs internal access +#include "GL_Simplex1to4.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletCollision/NarrowPhaseCollision/btPointCollector.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #include "CollisionDemo.h" #include "GL_ShapeDrawer.h" #include "GlutStuff.h" -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" float yaw=0.f,pitch=0.f,roll=0.f; diff --git a/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp b/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp index b3ac3fa94..d6a6aff20 100644 --- a/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp +++ b/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp @@ -19,17 +19,11 @@ subject to the following restrictions: /// #include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" -#include "CollisionShapes/ConvexHullShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionDispatch/CollisionWorld.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "IDebugDraw.h" +//include common Bullet Collision Detection headerfiles +#include "btBulletCollisionCommon.h" + +#include "LinearMath/GenIDebugDraw.h" #include "GL_ShapeDrawer.h" #include "CollisionInterfaceDemo.h" #include "GlutStuff.h" diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index 2d192d412..0835c97ad 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -16,19 +16,8 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" #include "MyMotionState.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "Dynamics/RigidBody.h" -#include "BroadphaseCollision/AxisSweep3.h" - -#include "ConstraintSolver/SequentialImpulseConstraintSolver.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" -#include "IDebugDraw.h" +#include "btBulletDynamicsCommon.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" #include "PHY_Pro.h" #include "ConcaveDemo.h" diff --git a/Demos/ConcaveDemo/MyMotionState.cpp b/Demos/ConcaveDemo/MyMotionState.cpp index 956aac1ec..4699dd718 100644 --- a/Demos/ConcaveDemo/MyMotionState.cpp +++ b/Demos/ConcaveDemo/MyMotionState.cpp @@ -14,7 +14,7 @@ subject to the following restrictions: */ #include "MyMotionState.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdPoint3.h" MyMotionState::MyMotionState() { diff --git a/Demos/ConcaveDemo/MyMotionState.h b/Demos/ConcaveDemo/MyMotionState.h index e1adb2bfa..cbf9988e2 100644 --- a/Demos/ConcaveDemo/MyMotionState.h +++ b/Demos/ConcaveDemo/MyMotionState.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define MY_MOTIONSTATE_H #include "PHY_IMotionState.h" -#include +#include class MyMotionState : public PHY_IMotionState diff --git a/Demos/ConstraintDemo/ConstraintDemo.cpp b/Demos/ConstraintDemo/ConstraintDemo.cpp index 706f7a59f..dfc42d98d 100644 --- a/Demos/ConstraintDemo/ConstraintDemo.cpp +++ b/Demos/ConstraintDemo/ConstraintDemo.cpp @@ -16,15 +16,8 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" #include "MyMotionState.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" - -#include "Dynamics/RigidBody.h" -#include "ConstraintSolver/SequentialImpulseConstraintSolver.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "IDebugDraw.h" +#include "btBulletDynamicsCommon.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" diff --git a/Demos/ConstraintDemo/MyMotionState.cpp b/Demos/ConstraintDemo/MyMotionState.cpp index 956aac1ec..4699dd718 100644 --- a/Demos/ConstraintDemo/MyMotionState.cpp +++ b/Demos/ConstraintDemo/MyMotionState.cpp @@ -14,7 +14,7 @@ subject to the following restrictions: */ #include "MyMotionState.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdPoint3.h" MyMotionState::MyMotionState() { diff --git a/Demos/ConstraintDemo/MyMotionState.h b/Demos/ConstraintDemo/MyMotionState.h index e1adb2bfa..cbf9988e2 100644 --- a/Demos/ConstraintDemo/MyMotionState.h +++ b/Demos/ConstraintDemo/MyMotionState.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define MY_MOTIONSTATE_H #include "PHY_IMotionState.h" -#include +#include class MyMotionState : public PHY_IMotionState diff --git a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp index 5d00710e7..f0490b6e6 100644 --- a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp +++ b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp @@ -18,26 +18,28 @@ Also comparision with Algebraic CCD and Interval Arithmetic methods (Stephane Redon) */ -#include "SimdQuaternion.h" -#include "SimdTransform.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "NarrowPhaseCollision/GjkConvexCast.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "NarrowPhaseCollision/ContinuousConvexCollision.h" +///This low level demo need internal access, and intentionally doesn't include the btBulletCollisionCommon.h headerfile +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" -#include "SimdTransformUtil.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" + +#include "LinearMath/SimdTransformUtil.h" #include "DebugCastResult.h" -#include "CollisionShapes/SphereShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #include "GL_ShapeDrawer.h" #include "ContinuousConvexCollision.h" diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp index 797e51ea9..21f576e80 100644 --- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp +++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp @@ -19,27 +19,10 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" +#include "btBulletDynamicsCommon.h" -//#include "GL_LineSegmentShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/ConvexTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" - - -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" - -#include "Dynamics/RigidBody.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" - -#include "quickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" diff --git a/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp b/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp index 2aad926bb..b1de88bf4 100644 --- a/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp +++ b/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp @@ -20,15 +20,15 @@ subject to the following restrictions: /// #include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionShapes/ConvexHullShape.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/CollisionShapes/btConvexHullShape.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "NarrowPhaseCollision/PointCollector.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletDynamics/NarrowPhaseCollision/btPointCollector.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #include "GL_ShapeDrawer.h" #ifdef WIN32 //needed for glut.h diff --git a/Demos/EPAPenDepthDemo/EpaPenDepthDemo.cpp b/Demos/EPAPenDepthDemo/EpaPenDepthDemo.cpp index 4e951527f..a5f1f4575 100644 --- a/Demos/EPAPenDepthDemo/EpaPenDepthDemo.cpp +++ b/Demos/EPAPenDepthDemo/EpaPenDepthDemo.cpp @@ -24,8 +24,8 @@ subject to the following restrictions: */ #include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" #include "GL_ShapeDrawer.h" #include #include "GlutStuff.h" @@ -34,11 +34,11 @@ subject to the following restrictions: #include #include -#include "CollisionShapes/ConvexShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" #include "NarrowPhaseCollision/EpaCommon.h" #include "NarrowPhaseCollision/EpaVertex.h" @@ -46,7 +46,7 @@ subject to the following restrictions: #include "NarrowPhaseCollision/EpaFace.h" #include "NarrowPhaseCollision/EpaPolyhedron.h" #include "NarrowPhaseCollision/Epa.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h" EpaPenetrationDepthSolver epaPenDepthSolver; diff --git a/Demos/ForkLiftDemo/CMakeLists.txt b/Demos/ForkLiftDemo/CMakeLists.txt index b9f76d277..cfd36e784 100644 --- a/Demos/ForkLiftDemo/CMakeLists.txt +++ b/Demos/ForkLiftDemo/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/ForkLiftDemo/ForkLiftDemo.cpp b/Demos/ForkLiftDemo/ForkLiftDemo.cpp index fff93d697..d5acdca89 100644 --- a/Demos/ForkLiftDemo/ForkLiftDemo.cpp +++ b/Demos/ForkLiftDemo/ForkLiftDemo.cpp @@ -23,36 +23,12 @@ subject to the following restrictions: #include "ParallelPhysicsEnvironment.h" #include "CcdPhysicsController.h" -//#include "GL_LineSegmentShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/StaticPlaneShape.h" -#include "CollisionShapes/CompoundShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" -#include "CollisionShapes/CylinderShape.h" +#include "btBulletDynamicsCommon.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" - -#include "Dynamics/RigidBody.h" -#include "Vehicle/RaycastVehicle.h" #include "PHY_IVehicle.h" - -#include "CollisionDispatch/CollisionDispatcher.h" - #include "ParallelIslandDispatcher.h" - -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" - -#include "quickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" diff --git a/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp b/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp index a3dd3417e..ebc577cb6 100644 --- a/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp +++ b/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp @@ -19,23 +19,25 @@ Also comparision with Algebraic CCD and Interval Arithmetic methods (Stephane Redon) */ -#include "SimdQuaternion.h" -#include "SimdTransform.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "NarrowPhaseCollision/GjkConvexCast.h" -#include "NarrowPhaseCollision/ContinuousConvexCollision.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" +///Low level demo, doesn't include btBulletCollisionCommon.h +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" + +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" #ifdef USE_ALGEBRAIC_CCD #include "NarrowPhaseCollision/BU_CollisionPair.h" #endif //USE_ALGEBRAIC_CCD -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" #include "GL_ShapeDrawer.h" #include "LinearConvexCastDemo.h" @@ -119,8 +121,8 @@ void LinearConvexCastDemo::clientMoveAndDisplay() displayCallback(); } -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" static VoronoiSimplexSolver sVoronoiSimplexSolver; diff --git a/Demos/Jamfile b/Demos/Jamfile index a975795a3..45ba348a5 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes" rule BulletDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : bullet bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; + LinkWith $(<) : bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] @@ -24,7 +24,7 @@ if $(GLUT.AVAILABLE) = "yes" rule ExtraDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : collada-dom libxml convexdecomposition bullet bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; + LinkWith $(<) : collada-dom libxml convexdecomposition bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] @@ -62,7 +62,7 @@ else rule BulletBasicDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : bullet bulletphysicsinterfacecommon bulletccdphysics bulletmath ; + LinkWith $(<) : bulletcollision bulletphysicsinterfacecommon bulletccdphysics bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt index fb39bbae1..a81ac92d6 100644 --- a/Demos/OpenGL/CMakeLists.txt +++ b/Demos/OpenGL/CMakeLists.txt @@ -47,7 +47,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) ADD_LIBRARY(LibOpenGLSupport @@ -59,4 +59,5 @@ ADD_LIBRARY(LibOpenGLSupport GLDebugDrawer.cpp GlutStuff.cpp RenderTexture.cpp + DemoApplication.cpp ) diff --git a/Demos/OpenGL/DebugCastResult.h b/Demos/OpenGL/DebugCastResult.h index a21d2bb24..05a34215d 100644 --- a/Demos/OpenGL/DebugCastResult.h +++ b/Demos/OpenGL/DebugCastResult.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef DEBUG_CAST_RESULT_H #define DEBUG_CAST_RESULT_H -#include "NarrowPhaseCollision/ConvexCast.h" -#include "SimdTransform.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexCast.h" +#include "LinearMath/SimdTransform.h" #include "GL_ShapeDrawer.h" #ifdef WIN32 #include diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index ac2473439..17b9bf6f9 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -14,16 +14,16 @@ subject to the following restrictions: */ #include "DemoApplication.h" -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" -#include "ConstraintSolver/Point2PointConstraint.h"//picking +#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"//picking #include "PHY_Pro.h" -#include "CollisionShapes/CollisionShape.h" -#include "CollisionShapes/BoxShape.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" #include "GL_ShapeDrawer.h" -#include "quickprof.h" +#include "LinearMath/GenQuickprof.h" #include "BMF_Api.h" int numObjects = 0; diff --git a/Demos/OpenGL/DemoApplication.h b/Demos/OpenGL/DemoApplication.h index 72653d0c5..31f2ae384 100644 --- a/Demos/OpenGL/DemoApplication.h +++ b/Demos/OpenGL/DemoApplication.h @@ -35,9 +35,9 @@ subject to the following restrictions: #include -#include "SimdVector3.h" -#include "SimdMatrix3x3.h" -#include "SimdTransform.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdMatrix3x3.h" +#include "LinearMath/SimdTransform.h" class CcdPhysicsEnvironment; class CcdPhysicsController; diff --git a/Demos/OpenGL/GLDebugDrawer.cpp b/Demos/OpenGL/GLDebugDrawer.cpp index 3522180ee..716fd5782 100644 --- a/Demos/OpenGL/GLDebugDrawer.cpp +++ b/Demos/OpenGL/GLDebugDrawer.cpp @@ -1,6 +1,6 @@ #include "GLDebugDrawer.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdPoint3.h" #ifdef WIN32 //needed for glut.h #include diff --git a/Demos/OpenGL/GLDebugDrawer.h b/Demos/OpenGL/GLDebugDrawer.h index 4b20c757d..2a4942580 100644 --- a/Demos/OpenGL/GLDebugDrawer.h +++ b/Demos/OpenGL/GLDebugDrawer.h @@ -1,7 +1,7 @@ #ifndef GL_DEBUG_DRAWER_H #define GL_DEBUG_DRAWER_H -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index 5b6e9ae09..82fa73791 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -27,19 +27,19 @@ subject to the following restrictions: #endif #include "GL_ShapeDrawer.h" -#include "CollisionShapes/PolyhedralConvexShape.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/CylinderShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/CompoundShape.h" +#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" +#include "BulletCollision/CollisionShapes/btCylinderShape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" +#include "BulletCollision/CollisionShapes/btCompoundShape.h" -#include "CollisionShapes/ConvexTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h" -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" //for debugmodes #include "BMF_Api.h" #include //printf debugging diff --git a/Demos/OpenGL/GL_ShapeDrawer.h b/Demos/OpenGL/GL_ShapeDrawer.h index c37ee1906..2e1dfecc1 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.h +++ b/Demos/OpenGL/GL_ShapeDrawer.h @@ -16,7 +16,7 @@ subject to the following restrictions: #define GL_SHAPE_DRAWER_H class CollisionShape; -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" /// OpenGL shape drawing class GL_ShapeDrawer diff --git a/Demos/OpenGL/GL_Simplex1to4.cpp b/Demos/OpenGL/GL_Simplex1to4.cpp index 5d0f3f175..fc577a34b 100644 --- a/Demos/OpenGL/GL_Simplex1to4.cpp +++ b/Demos/OpenGL/GL_Simplex1to4.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ #include "GL_Simplex1to4.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" #include "GL_ShapeDrawer.h" #ifdef WIN32 #include @@ -26,7 +26,7 @@ subject to the following restrictions: #else #include #endif -#include "SimdTransform.h" +#include "LinearMath/SimdTransform.h" GL_Simplex1to4::GL_Simplex1to4() :m_simplexSolver(0) diff --git a/Demos/OpenGL/GL_Simplex1to4.h b/Demos/OpenGL/GL_Simplex1to4.h index 81d628377..42ad58310 100644 --- a/Demos/OpenGL/GL_Simplex1to4.h +++ b/Demos/OpenGL/GL_Simplex1to4.h @@ -15,9 +15,9 @@ subject to the following restrictions: #ifndef GL_SIMPLEX_1TO4_H #define GL_SIMPLEX_1TO4_H -#include "CollisionShapes/Simplex1to4Shape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" ///GL_Simplex1to4 is a class to debug a Simplex Solver with 1 to 4 points. ///Can be used by GJK. diff --git a/Demos/OpenGL/RenderTexture.h b/Demos/OpenGL/RenderTexture.h index 3c30e624c..9ac636b2c 100644 --- a/Demos/OpenGL/RenderTexture.h +++ b/Demos/OpenGL/RenderTexture.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef RENDER_TEXTURE_H #define RENDER_TEXTURE_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" #include "BMF_FontData.h" /// diff --git a/Demos/Raytracer/Raytracer.cpp b/Demos/Raytracer/Raytracer.cpp index d34318756..3c6e43031 100644 --- a/Demos/Raytracer/Raytracer.cpp +++ b/Demos/Raytracer/Raytracer.cpp @@ -16,31 +16,33 @@ Raytracer uses the Convex Raycast to visualize the Collision Shapes/Minkowski Su Very basic raytracer, rendering into a texture. */ +///Low level demo, doesn't include btBulletCollisionCommon.h + #include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" #include "GL_ShapeDrawer.h" #include "Raytracer.h" #include "GlutStuff.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "NarrowPhaseCollision/GjkConvexCast.h" -#include "NarrowPhaseCollision/ContinuousConvexCollision.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" #ifdef USE_ALGEBRAIC_CCD #include "NarrowPhaseCollision/BU_CollisionPair.h" #endif //USE_ALGEBRAIC_CCD -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/MultiSphereShape.h" -#include "CollisionShapes/ConvexHullShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/CylinderShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" +#include "BulletCollision/CollisionShapes/btConvexHullShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" +#include "BulletCollision/CollisionShapes/btCylinderShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" diff --git a/Demos/SimplexDemo/SimplexDemo.cpp b/Demos/SimplexDemo/SimplexDemo.cpp index 94abe4636..5d31f2a2b 100644 --- a/Demos/SimplexDemo/SimplexDemo.cpp +++ b/Demos/SimplexDemo/SimplexDemo.cpp @@ -19,11 +19,11 @@ subject to the following restrictions: */ #include "GL_Simplex1to4.h" -#include "SimdQuaternion.h" -#include "SimdTransform.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" #include "GL_ShapeDrawer.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" #include "SimplexDemo.h" #include "GlutStuff.h" diff --git a/Demos/UserCollisionAlgorithm/CMakeLists.txt b/Demos/UserCollisionAlgorithm/CMakeLists.txt index b9b21695e..95b6858d8 100644 --- a/Demos/UserCollisionAlgorithm/CMakeLists.txt +++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp b/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp index a37e99875..7eaa83d1b 100644 --- a/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp +++ b/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp @@ -15,25 +15,8 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" - -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" - - -#include "CollisionShapes/Simplex1to4Shape.h" -#include "Dynamics/RigidBody.h" -#include "BroadphaseCollision/AxisSweep3.h" - -#include "ConstraintSolver/SequentialImpulseConstraintSolver.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" - -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" -#include "IDebugDraw.h" +#include "btBulletDynamicsCommon.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" #include "PHY_Pro.h" #include "UserCollisionAlgorithm.h" @@ -41,7 +24,7 @@ subject to the following restrictions: #include "GlutStuff.h" //The user defined collision algorithm -#include "CollisionDispatch/SphereSphereCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" GLDebugDrawer debugDrawer; diff --git a/Demos/VehicleDemo/CMakeLists.txt b/Demos/VehicleDemo/CMakeLists.txt index b78163b08..a63f06706 100644 --- a/Demos/VehicleDemo/CMakeLists.txt +++ b/Demos/VehicleDemo/CMakeLists.txt @@ -48,7 +48,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) LINK_LIBRARIES( diff --git a/Demos/VehicleDemo/VehicleDemo.cpp b/Demos/VehicleDemo/VehicleDemo.cpp index 852a1fee2..cb082567f 100644 --- a/Demos/VehicleDemo/VehicleDemo.cpp +++ b/Demos/VehicleDemo/VehicleDemo.cpp @@ -21,38 +21,15 @@ subject to the following restrictions: #include "CcdPhysicsEnvironment.h" #include "ParallelPhysicsEnvironment.h" - #include "CcdPhysicsController.h" -//#include "GL_LineSegmentShape.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionShapes/StaticPlaneShape.h" -#include "CollisionShapes/CompoundShape.h" -#include "CollisionShapes/Simplex1to4Shape.h" -#include "CollisionShapes/EmptyShape.h" -#include "CollisionShapes/CylinderShape.h" +#include "btBulletDynamicsCommon.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/TriangleIndexVertexArray.h" -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/TriangleMesh.h" - -#include "Dynamics/RigidBody.h" -#include "Vehicle/RaycastVehicle.h" #include "PHY_IVehicle.h" -#include "CollisionDispatch/CollisionDispatcher.h" - #include "ParallelIslandDispatcher.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" - -#include "quickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenQuickprof.h" +#include "LinearMath/GenIDebugDraw.h" #include "GLDebugDrawer.h" diff --git a/Doxyfile b/Doxyfile index 2ce47d3cf..cad313001 100644 --- a/Doxyfile +++ b/Doxyfile @@ -267,7 +267,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = Bullet BulletDynamics LinearMath Extras/PhysicsInterface Demos +INPUT = src Extras/PhysicsInterface Demos # If the value of the INPUT tag contains directories, you can use the diff --git a/Extras/AlgebraicCCD/BU_Collidable.cpp b/Extras/AlgebraicCCD/BU_Collidable.cpp index 4adb08506..80589325d 100644 --- a/Extras/AlgebraicCCD/BU_Collidable.cpp +++ b/Extras/AlgebraicCCD/BU_Collidable.cpp @@ -15,8 +15,8 @@ subject to the following restrictions: #include "BU_Collidable.h" -#include "CollisionShapes/CollisionShape.h" -#include +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include #include "BU_MotionStateInterface.h" BU_Collidable::BU_Collidable(BU_MotionStateInterface& motion,PolyhedralConvexShape& shape,void* userPointer ) diff --git a/Extras/AlgebraicCCD/BU_Collidable.h b/Extras/AlgebraicCCD/BU_Collidable.h index 9ff6229e3..a94beb6bc 100644 --- a/Extras/AlgebraicCCD/BU_Collidable.h +++ b/Extras/AlgebraicCCD/BU_Collidable.h @@ -20,7 +20,7 @@ subject to the following restrictions: class PolyhedralConvexShape; class BU_MotionStateInterface; -#include +#include class BU_Collidable { diff --git a/Extras/AlgebraicCCD/BU_CollisionPair.cpp b/Extras/AlgebraicCCD/BU_CollisionPair.cpp index 739d98e62..12edccc28 100644 --- a/Extras/AlgebraicCCD/BU_CollisionPair.cpp +++ b/Extras/AlgebraicCCD/BU_CollisionPair.cpp @@ -22,9 +22,9 @@ subject to the following restrictions: #include "BU_MotionStateInterface.h" -#include "CollisionShapes/PolyhedralConvexShape.h" +#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include -#include "SimdTransformUtil.h" +#include "LinearMath/SimdTransformUtil.h" diff --git a/Extras/AlgebraicCCD/BU_EdgeEdge.cpp b/Extras/AlgebraicCCD/BU_EdgeEdge.cpp index c4aee6726..e5261b5a7 100644 --- a/Extras/AlgebraicCCD/BU_EdgeEdge.cpp +++ b/Extras/AlgebraicCCD/BU_EdgeEdge.cpp @@ -16,8 +16,8 @@ subject to the following restrictions: #include "BU_EdgeEdge.h" #include "BU_Screwing.h" -#include -#include +#include +#include //#include "BU_IntervalArithmeticPolynomialSolver.h" #include "BU_AlgebraicPolynomialSolver.h" diff --git a/Extras/AlgebraicCCD/BU_EdgeEdge.h b/Extras/AlgebraicCCD/BU_EdgeEdge.h index 6455a8f1c..8c3721dd3 100644 --- a/Extras/AlgebraicCCD/BU_EdgeEdge.h +++ b/Extras/AlgebraicCCD/BU_EdgeEdge.h @@ -18,13 +18,13 @@ subject to the following restrictions: #define BU_EDGEEDGE class BU_Screwing; -#include -#include -#include +#include +#include +#include //class BUM_Point2; -#include +#include ///BU_EdgeEdge implements algebraic time of impact calculation between two (angular + linear) moving edges. class BU_EdgeEdge diff --git a/Extras/AlgebraicCCD/BU_MotionStateInterface.h b/Extras/AlgebraicCCD/BU_MotionStateInterface.h index 96d021e78..867c7e4ac 100644 --- a/Extras/AlgebraicCCD/BU_MotionStateInterface.h +++ b/Extras/AlgebraicCCD/BU_MotionStateInterface.h @@ -18,8 +18,8 @@ subject to the following restrictions: #define BU_MOTIONSTATE -#include -#include +#include +#include #include class BU_MotionStateInterface diff --git a/Extras/AlgebraicCCD/BU_PolynomialSolverInterface.h b/Extras/AlgebraicCCD/BU_PolynomialSolverInterface.h index 044636581..beb0be58d 100644 --- a/Extras/AlgebraicCCD/BU_PolynomialSolverInterface.h +++ b/Extras/AlgebraicCCD/BU_PolynomialSolverInterface.h @@ -15,7 +15,7 @@ subject to the following restrictions: #ifndef BUM_POLYNOMIAL_SOLVER_INTERFACE #define BUM_POLYNOMIAL_SOLVER_INTERFACE -#include +#include // //BUM_PolynomialSolverInterface is interface class for polynomial root finding. //The number of roots is returned as a result, query GetRoot to get the actual solution. diff --git a/Extras/AlgebraicCCD/BU_Screwing.h b/Extras/AlgebraicCCD/BU_Screwing.h index a7f95d7db..8c521c353 100644 --- a/Extras/AlgebraicCCD/BU_Screwing.h +++ b/Extras/AlgebraicCCD/BU_Screwing.h @@ -18,9 +18,9 @@ subject to the following restrictions: #define B_SCREWING_H -#include -#include -#include +#include +#include +#include #define SCREWEPSILON 0.00001f diff --git a/Extras/AlgebraicCCD/BU_VertexPoly.cpp b/Extras/AlgebraicCCD/BU_VertexPoly.cpp index fe5504041..d9e4bc876 100644 --- a/Extras/AlgebraicCCD/BU_VertexPoly.cpp +++ b/Extras/AlgebraicCCD/BU_VertexPoly.cpp @@ -17,9 +17,9 @@ subject to the following restrictions: #include "BU_VertexPoly.h" #include "BU_Screwing.h" -#include -#include -#include +#include +#include +#include #define USE_ALGEBRAIC #ifdef USE_ALGEBRAIC diff --git a/Extras/AlgebraicCCD/BU_VertexPoly.h b/Extras/AlgebraicCCD/BU_VertexPoly.h index a74468121..11b9b81c4 100644 --- a/Extras/AlgebraicCCD/BU_VertexPoly.h +++ b/Extras/AlgebraicCCD/BU_VertexPoly.h @@ -19,9 +19,9 @@ subject to the following restrictions: class BU_Screwing; -#include -#include -#include +#include +#include +#include ///BU_VertexPoly implements algebraic time of impact calculation between vertex and a plane. class BU_VertexPoly diff --git a/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.cpp b/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.cpp index 52beffaef..184d3d68d 100644 --- a/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.cpp +++ b/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: */ #include "SphereSphereCollisionAlgorithm.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionDispatch/CollisionObject.h" +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" SphereSphereCollisionAlgorithm::SphereSphereCollisionAlgorithm(PersistentManifold* mf,const CollisionAlgorithmConstructionInfo& ci,BroadphaseProxy* proxy0,BroadphaseProxy* proxy1) : CollisionAlgorithm(ci), diff --git a/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.h b/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.h index 954e9c380..5783a8306 100644 --- a/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.h +++ b/Extras/AlternativeCollisionAlgorithms/SphereSphereCollisionAlgorithm.h @@ -16,9 +16,9 @@ subject to the following restrictions: #ifndef SPHERE_SPHERE_COLLISION_ALGORITHM_H #define SPHERE_SPHERE_COLLISION_ALGORITHM_H -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "CollisionDispatch/CollisionCreateFunc.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" class PersistentManifold; /// SphereSphereCollisionAlgorithm provides sphere-sphere collision detection. diff --git a/Extras/EPA/Epa.cpp b/Extras/EPA/Epa.cpp index d535e40d7..4d46d506d 100644 --- a/Extras/EPA/Epa.cpp +++ b/Extras/EPA/Epa.cpp @@ -15,19 +15,19 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "SimdScalar.h" -#include "SimdVector3.h" -#include "SimdPoint3.h" -#include "SimdTransform.h" -#include "SimdMinMax.h" +#include "LinearMath/SimdScalar.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdPoint3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMinMax.h" -#include "CollisionShapes/ConvexShape.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" #include #include #include -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" #include "NarrowPhaseCollision/EpaCommon.h" diff --git a/Extras/EPA/EpaFace.cpp b/Extras/EPA/EpaFace.cpp index b87d89ced..331d97934 100644 --- a/Extras/EPA/EpaFace.cpp +++ b/Extras/EPA/EpaFace.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "SimdScalar.h" -#include "SimdVector3.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdScalar.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdPoint3.h" #include "NarrowPhaseCollision/EpaCommon.h" diff --git a/Extras/EPA/EpaPenetrationDepthSolver.cpp b/Extras/EPA/EpaPenetrationDepthSolver.cpp index 22c0b1109..c5cb907a4 100644 --- a/Extras/EPA/EpaPenetrationDepthSolver.cpp +++ b/Extras/EPA/EpaPenetrationDepthSolver.cpp @@ -14,17 +14,17 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "SimdScalar.h" -#include "SimdVector3.h" -#include "SimdPoint3.h" -#include "SimdTransform.h" -#include "SimdMinMax.h" +#include "LinearMath/SimdScalar.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdPoint3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMinMax.h" #include -#include "CollisionShapes/ConvexShape.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" #include "NarrowPhaseCollision/EpaCommon.h" @@ -33,7 +33,7 @@ subject to the following restrictions: #include "NarrowPhaseCollision/EpaFace.h" #include "NarrowPhaseCollision/EpaPolyhedron.h" #include "NarrowPhaseCollision/Epa.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h" SimdScalar g_GJKMaxRelError = 1e-3f; diff --git a/Extras/EPA/EpaPolyhedron.cpp b/Extras/EPA/EpaPolyhedron.cpp index 6ba07bbb4..b5a2dde92 100644 --- a/Extras/EPA/EpaPolyhedron.cpp +++ b/Extras/EPA/EpaPolyhedron.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "SimdScalar.h" -#include "SimdVector3.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdScalar.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdPoint3.h" #include "Memory2.h" #include diff --git a/Extras/ExtraSolid35/CombinedSimplexSolver.h b/Extras/ExtraSolid35/CombinedSimplexSolver.h index 023325251..95d5195f2 100644 --- a/Extras/ExtraSolid35/CombinedSimplexSolver.h +++ b/Extras/ExtraSolid35/CombinedSimplexSolver.h @@ -12,8 +12,8 @@ #ifndef COMBINED_SIMPLEX_SOLVER #define COMBINED_SIMPLEX_SOLVER -#include "NarrowPhaseCollision/SimplexSolverInterface.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" #include "Solid3JohnsonSimplexSolver.h" /// CombinedSimplexSolver runs both Solid and Voronoi Simplex Solver for comparison diff --git a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp index 79c6087b6..cc79f43c6 100644 --- a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp +++ b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp @@ -24,9 +24,9 @@ #include "Solid3EpaPenetrationDepth.h" #include #include -#include "NarrowPhaseCollision/SimplexSolverInterface.h" -#include "CollisionShapes/ConvexShape.h" -#include "GEN_MinMax.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "LinearMath/GenMinMax.h" #define ASSERT_MESSAGE diff --git a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h index 4919a5c47..0d2f98c28 100644 --- a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h +++ b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h @@ -25,7 +25,7 @@ #define SOLID3_EPA_PENETRATION_DEPTH_H -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" /// Solid3EpaPenetrationDepth contains the 'Expanding Polytope Algorithm' from Solid 3.5 class Solid3EpaPenetrationDepth : public ConvexPenetrationDepthSolver diff --git a/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.cpp b/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.cpp index 68f0880e5..0ad4e2ef7 100644 --- a/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.cpp +++ b/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.cpp @@ -22,7 +22,7 @@ */ #include "Solid3JohnsonSimplexSolver.h" -#include "GEN_MinMax.h" +#include "LinearMath/GenMinMax.h" //#define USE_BACKUP_PROCEDURE //#define FAST_CLOSEST diff --git a/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.h b/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.h index 9c40abe46..48b015c19 100644 --- a/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.h +++ b/Extras/ExtraSolid35/Solid3JohnsonSimplexSolver.h @@ -24,7 +24,7 @@ #ifndef SOLID3JOHNSON_SIMPLEX_SOLVER_H #define SOLID3JOHNSON_SIMPLEX_SOLVER_H -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" //#define JOHNSON_ROBUST diff --git a/Extras/LibXML/Makefile b/Extras/LibXML/Makefile index be53106fd..d64fc3958 100644 --- a/Extras/LibXML/Makefile +++ b/Extras/LibXML/Makefile @@ -1,2420 +1,375 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. +# Include the progress variables for this target. +include progress.make -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.4 -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +#============================================================================= +# Set environment variables for the build. - - - - - -srcdir = . -top_srcdir = . - -pkgdatadir = $(datadir)/libxml2 -pkglibdir = $(libdir)/libxml2 -pkgincludedir = $(includedir)/libxml2 -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-redhat-linux-gnu -host_triplet = i686-redhat-linux-gnu -noinst_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \ - testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ - testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ - testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ - testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ - runsuite$(EXEEXT) -bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libxml-2.0-uninstalled.pc.in \ - $(srcdir)/libxml-2.0.pc.in $(srcdir)/libxml.spec.in \ - $(srcdir)/xml2-config.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS TODO acconfig.h config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = libxml2.spec xml2-config libxml-2.0.pc \ - libxml-2.0-uninstalled.pc -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(confexecdir)" \ - "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libxml2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__libxml2_la_SOURCES_DIST = SAX.c entities.c encoding.c error.c \ - parserInternals.c parser.c tree.c hash.c list.c xmlIO.c \ - xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c \ - debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c \ - DOCBparser.c catalog.c globals.c threads.c c14n.c xmlstring.c \ - xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \ - xmlreader.c relaxng.c dict.c SAX2.c xmlwriter.c legacy.c \ - chvalid.c pattern.c xmlsave.c xmlmodule.c schematron.c \ - triostr.c trio.c -am_libxml2_la_OBJECTS = SAX.lo entities.lo \ - encoding.lo error.lo \ - parserInternals.lo parser.lo tree.lo \ - hash.lo list.lo xmlIO.lo xmlmemory.lo \ - uri.lo valid.lo xlink.lo \ - HTMLparser.lo HTMLtree.lo debugXML.lo \ - xpath.lo xpointer.lo xinclude.lo \ - nanohttp.lo nanoftp.lo DOCBparser.lo \ - catalog.lo globals.lo threads.lo \ - c14n.lo xmlstring.lo xmlregexp.lo \ - xmlschemas.lo xmlschemastypes.lo \ - xmlunicode.lo xmlreader.lo relaxng.lo \ - dict.lo SAX2.lo xmlwriter.lo \ - legacy.lo chvalid.lo pattern.lo \ - xmlsave.lo xmlmodule.lo schematron.lo -#am_libxml2_la_OBJECTS = SAX.lo entities.lo \ -# encoding.lo error.lo \ -# parserInternals.lo parser.lo tree.lo \ -# hash.lo list.lo xmlIO.lo xmlmemory.lo \ -# uri.lo valid.lo xlink.lo HTMLparser.lo \ -# HTMLtree.lo debugXML.lo xpath.lo \ -# xpointer.lo xinclude.lo nanohttp.lo \ -# nanoftp.lo DOCBparser.lo catalog.lo \ -# globals.lo threads.lo c14n.lo \ -# xmlstring.lo xmlregexp.lo \ -# xmlschemas.lo xmlschemastypes.lo \ -# xmlunicode.lo triostr.lo trio.lo \ -# xmlreader.lo relaxng.lo dict.lo \ -# SAX2.lo xmlwriter.lo legacy.lo \ -# chvalid.lo pattern.lo xmlsave.lo \ -# xmlmodule.lo schematron.lo -libxml2_la_OBJECTS = $(am_libxml2_la_OBJECTS) -testdso_la_LIBADD = -am_testdso_la_OBJECTS = testdso.lo -testdso_la_OBJECTS = $(am_testdso_la_OBJECTS) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am_runsuite_OBJECTS = runsuite.$(OBJEXT) -runsuite_OBJECTS = $(am_runsuite_OBJECTS) -am__DEPENDENCIES_2 = $(top_builddir)/libxml2.la $(am__DEPENDENCIES_1) -am_runtest_OBJECTS = runtest.$(OBJEXT) -runtest_OBJECTS = $(am_runtest_OBJECTS) -am_testAutomata_OBJECTS = testAutomata.$(OBJEXT) -testAutomata_OBJECTS = $(am_testAutomata_OBJECTS) -am_testC14N_OBJECTS = testC14N.$(OBJEXT) -testC14N_OBJECTS = $(am_testC14N_OBJECTS) -am_testHTML_OBJECTS = testHTML.$(OBJEXT) -testHTML_OBJECTS = $(am_testHTML_OBJECTS) -am_testModule_OBJECTS = testModule.$(OBJEXT) -testModule_OBJECTS = $(am_testModule_OBJECTS) -am_testReader_OBJECTS = testReader.$(OBJEXT) -testReader_OBJECTS = $(am_testReader_OBJECTS) -am_testRegexp_OBJECTS = testRegexp.$(OBJEXT) -testRegexp_OBJECTS = $(am_testRegexp_OBJECTS) -am_testRelax_OBJECTS = testRelax.$(OBJEXT) -testRelax_OBJECTS = $(am_testRelax_OBJECTS) -am_testSAX_OBJECTS = testSAX.$(OBJEXT) -testSAX_OBJECTS = $(am_testSAX_OBJECTS) -am_testSchemas_OBJECTS = testSchemas.$(OBJEXT) -testSchemas_OBJECTS = $(am_testSchemas_OBJECTS) -am_testThreads_OBJECTS = testThreads.$(OBJEXT) -testThreads_OBJECTS = $(am_testThreads_OBJECTS) -am_testURI_OBJECTS = testURI.$(OBJEXT) -testURI_OBJECTS = $(am_testURI_OBJECTS) -am_testXPath_OBJECTS = testXPath.$(OBJEXT) -testXPath_OBJECTS = $(am_testXPath_OBJECTS) -am_testapi_OBJECTS = testapi.$(OBJEXT) -testapi_OBJECTS = $(am_testapi_OBJECTS) -am_xmlcatalog_OBJECTS = xmlcatalog.$(OBJEXT) -xmlcatalog_OBJECTS = $(am_xmlcatalog_OBJECTS) -am_xmllint_OBJECTS = xmllint.$(OBJEXT) -xmllint_OBJECTS = $(am_xmllint_OBJECTS) -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libxml2_la_SOURCES) $(testdso_la_SOURCES) \ - $(runsuite_SOURCES) $(runtest_SOURCES) $(testAutomata_SOURCES) \ - $(testC14N_SOURCES) $(testHTML_SOURCES) $(testModule_SOURCES) \ - $(testReader_SOURCES) $(testRegexp_SOURCES) \ - $(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \ - $(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \ - $(testapi_SOURCES) $(xmlcatalog_SOURCES) $(xmllint_SOURCES) -DIST_SOURCES = $(am__libxml2_la_SOURCES_DIST) $(testdso_la_SOURCES) \ - $(runsuite_SOURCES) $(runtest_SOURCES) $(testAutomata_SOURCES) \ - $(testC14N_SOURCES) $(testHTML_SOURCES) $(testModule_SOURCES) \ - $(testReader_SOURCES) $(testRegexp_SOURCES) \ - $(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \ - $(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \ - $(testapi_SOURCES) $(xmlcatalog_SOURCES) $(xmllint_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -man1dir = $(mandir)/man1 -man3dir = $(mandir)/man3 -NROFF = nroff -MANS = $(man_MANS) -confexecDATA_INSTALL = $(INSTALL_DATA) -m4dataDATA_INSTALL = $(INSTALL_DATA) -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run autoconf -AUTOHEADER = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run autoheader -AUTOMAKE = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run automake-1.9 -AWK = gawk -BASE_THREAD_LIBS = -C14N_OBJ = c14n.c -CATALOG_OBJ = catalog.o -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -CYGPATH_W = echo -CYGWIN_EXTRA_LDFLAGS = -CYGWIN_EXTRA_PYTHON_LIBADD = -DEBUG_OBJ = debugXML.o -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DLLTOOL = dlltool -DOCB_OBJ = DOCBparser.o -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = f95 -FFLAGS = -g -O2 -FTP_OBJ = -HAVE_ISINF = -HAVE_ISNAN = -HTML_DIR = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html -HTML_OBJ = HTMLparser.o HTMLtree.o -HTTP_OBJ = -ICONV_LIBS = -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBXML_MAJOR_VERSION = 2 -LIBXML_MICRO_VERSION = 26 -LIBXML_MINOR_VERSION = 6 -LIBXML_VERSION = 2.6.26 -LIBXML_VERSION_EXTRA = -LIBXML_VERSION_INFO = 8:26:6 -LIBXML_VERSION_NUMBER = 20626 -LN_S = ln -s -LTLIBOBJS = -MAKEINFO = ${SHELL} /home/ecoumans/svnnew/bullet/Extras/LibXML/missing --run makeinfo -MODULE_EXTENSION = .so -MODULE_PLATFORM_LIBS = -ldl -MV = /bin/mv -M_LIBS = -lm -OBJDUMP = objdump -OBJEXT = o -PACKAGE = libxml2 -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL = /usr/bin/perl -PYTHON = /usr/local/bin/python -PYTHON_INCLUDES = /usr/include/python2.4 -PYTHON_SITE_PACKAGES = /usr/local/lib/python2.4/site-packages -PYTHON_SUBDIR = python -PYTHON_TESTS = RelaxNGPythonTests SchemasPythonTests -PYTHON_VERSION = 2.4 -RANLIB = ranlib -RDL_LIBS = -READER_TEST = Readertests -RELDATE = Mon Jun 19 2006 -RM = /bin/rm -SET_MAKE = +# The shell in which to execute make rules. SHELL = /bin/sh -STATIC_BINARIES = -STRIP = strip -TAR = /bin/tar -TEST_C14N = C14Ntests -TEST_CATALOG = Catatests -TEST_DEBUG = Scripttests -TEST_HTML = HTMLtests -TEST_MODULES = ModuleTests -TEST_PATTERN = Patterntests -TEST_PHTML = HTMLPushtests -TEST_PUSH = XMLPushtests -TEST_REGEXPS = Regexptests Automatatests -TEST_SAX = SAXtests -TEST_SCHEMAS = Schemastests Relaxtests -TEST_SCHEMATRON = Schematrontests -TEST_THREADS = -TEST_VALID = Validtests -TEST_VTIME = VTimingtests -TEST_XINCLUDE = XIncludetests -TEST_XPATH = XPathtests -TEST_XPTR = XPtrtests -THREADS_W32 = -THREAD_CFLAGS = -THREAD_LIBS = -U = -VERSION = 2.6.26 -WIN32_EXTRA_LDFLAGS = -WIN32_EXTRA_LIBADD = -WITH_C14N = 1 -WITH_CATALOG = 1 -WITH_DEBUG = 1 -WITH_DOCB = 1 -WITH_FTP = 0 -WITH_HTML = 1 -WITH_HTTP = 0 -WITH_ICONV = 1 -WITH_ISO8859X = 1 -WITH_LEGACY = 1 -WITH_MEM_DEBUG = 0 -WITH_MODULES = 1 -WITH_OUTPUT = 1 -WITH_PATTERN = 1 -WITH_PUSH = 1 -WITH_PYTHON_FALSE = # -WITH_PYTHON_TRUE = -WITH_READER = 1 -WITH_REGEXPS = 1 -WITH_RUN_DEBUG = 0 -WITH_SAX1 = 1 -WITH_SCHEMAS = 1 -WITH_SCHEMATRON = 1 -WITH_THREADS = 0 -WITH_TREE = 1 -WITH_TRIO = 0 -WITH_TRIO_SOURCES_FALSE = -WITH_TRIO_SOURCES_TRUE = # -WITH_VALID = 1 -WITH_WRITER = 1 -WITH_XINCLUDE = 1 -WITH_XPATH = 1 -WITH_XPTR = 1 -XINCLUDE_OBJ = xinclude.o -XMLLINT = /usr/bin/xmllint -XML_CFLAGS = -XML_INCLUDEDIR = -I${includedir}/libxml2 -XML_LIBDIR = -L${libdir} -XML_LIBS = -lxml2 -lm -XML_LIBTOOLLIBS = libxml2.la -XPATH_OBJ = xpath.o -XPTR_OBJ = xpointer.o -XSLTPROC = /usr/bin/xsltproc -Z_CFLAGS = -Z_LIBS = -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = f95 -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-redhat-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = redhat -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-redhat-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = redhat -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/ecoumans/svnnew/bullet/Extras/LibXML/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -pythondir = $(libdir)/python$(PYTHON_VERSION)/site-packages -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = include . doc example xstc python -DIST_SUBDIRS = include . doc example python xstc -INCLUDES = -I$(top_builddir)/include -I./include -bin_SCRIPTS = xml2-config -lib_LTLIBRARIES = libxml2.la -libxml2_la_LIBADD = $(ICONV_LIBS) -lm -libxml2_la_LDFLAGS = -version-info 8:26:6 -ldl -libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ - parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ - valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \ - xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \ - catalog.c globals.c threads.c c14n.c xmlstring.c \ - xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \ - xmlreader.c relaxng.c dict.c SAX2.c \ - xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \ - xmlmodule.c schematron.c -#libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ -# parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ -# valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \ -# xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \ -# catalog.c globals.c threads.c c14n.c xmlstring.c \ -# xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \ -# triostr.c trio.c xmlreader.c relaxng.c dict.c SAX2.c \ -# xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \ -# xmlmodule.c schematron.c +# The CMake executable. +CMAKE_COMMAND = /usr/bin/cmake -DEPS = $(top_builddir)/libxml2.la -LDADDS = $(top_builddir)/libxml2.la $(ICONV_LIBS) -lm -man_MANS = xml2-config.1 libxml.3 -m4datadir = $(datadir)/aclocal -m4data_DATA = libxml.m4 -runtest_SOURCES = runtest.c -runtest_LDFLAGS = -runtest_DEPENDENCIES = $(DEPS) -runtest_LDADD = $(LDADDS) -runsuite_SOURCES = runsuite.c -runsuite_LDFLAGS = -runsuite_DEPENDENCIES = $(DEPS) -runsuite_LDADD = $(LDADDS) -xmllint_SOURCES = xmllint.c -xmllint_LDFLAGS = -xmllint_DEPENDENCIES = $(DEPS) -xmllint_LDADD = $(LDADDS) -testSAX_SOURCES = testSAX.c -testSAX_LDFLAGS = -testSAX_DEPENDENCIES = $(DEPS) -testSAX_LDADD = $(LDADDS) -testHTML_SOURCES = testHTML.c -testHTML_LDFLAGS = -testHTML_DEPENDENCIES = $(DEPS) -testHTML_LDADD = $(LDADDS) -xmlcatalog_SOURCES = xmlcatalog.c -xmlcatalog_LDFLAGS = -xmlcatalog_DEPENDENCIES = $(DEPS) -xmlcatalog_LDADD = $(LDADDS) -testXPath_SOURCES = testXPath.c -testXPath_LDFLAGS = -testXPath_DEPENDENCIES = $(DEPS) -testXPath_LDADD = $(LDADDS) -testC14N_SOURCES = testC14N.c -testC14N_LDFLAGS = -testC14N_DEPENDENCIES = $(DEPS) -testC14N_LDADD = $(LDADDS) -testThreads_SOURCES = testThreads.c -testThreads_LDFLAGS = -testThreads_DEPENDENCIES = $(DEPS) -testThreads_LDADD = $(LDADDS) -testURI_SOURCES = testURI.c -testURI_LDFLAGS = -testURI_DEPENDENCIES = $(DEPS) -testURI_LDADD = $(LDADDS) -testRegexp_SOURCES = testRegexp.c -testRegexp_LDFLAGS = -testRegexp_DEPENDENCIES = $(DEPS) -testRegexp_LDADD = $(LDADDS) -testAutomata_SOURCES = testAutomata.c -testAutomata_LDFLAGS = -testAutomata_DEPENDENCIES = $(DEPS) -testAutomata_LDADD = $(LDADDS) -testSchemas_SOURCES = testSchemas.c -testSchemas_LDFLAGS = -testSchemas_DEPENDENCIES = $(DEPS) -testSchemas_LDADD = $(LDADDS) -testRelax_SOURCES = testRelax.c -testRelax_LDFLAGS = -testRelax_DEPENDENCIES = $(DEPS) -testRelax_LDADD = $(LDADDS) -testReader_SOURCES = testReader.c -testReader_LDFLAGS = -testReader_DEPENDENCIES = $(DEPS) -testReader_LDADD = $(LDADDS) -testModule_SOURCES = testModule.c -testModule_LDFLAGS = -testModule_DEPENDENCIES = $(DEPS) -testModule_LDADD = $(LDADDS) -noinst_LTLIBRARIES = testdso.la -testdso_la_SOURCES = testdso.c -testdso_la_LDFLAGS = -module -rpath $(libdir) -testapi_SOURCES = testapi.c -testapi_LDFLAGS = -testapi_DEPENDENCIES = $(DEPS) -testapi_LDADD = $(LDADDS) -CLEANFILES = xml2Conf.sh -confexecdir = $(libdir) -confexec_DATA = xml2Conf.sh -CVS_EXTRA_DIST = -EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ - libxml.m4 Copyright check-xml-test-suite.py gentest.py \ - check-relaxng-test-suite.py check-relaxng-test-suite2.py \ - check-xsddata-test-suite.py check-xinclude-test-suite.py \ - example/Makefile.am example/gjobread.c example/gjobs.xml \ - $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \ - trionan.c trionan.h triostr.c triostr.h trio.c trio.h \ - triop.h triodef.h libxml.h elfgcchack.h \ - testThreadsWin32.c genUnicode.py TODO_SCHEMAS \ - dbgen.pl dbgenattr.pl regressions.py regressions.xml \ - README.tests Makefile.tests \ - $(CVS_EXTRA_DIST) +# The command to remove a file. +RM = /usr/bin/cmake -E remove -f -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libxml-2.0.pc +# The program to use to edit the cache. +CMAKE_EDIT_COMMAND = /usr/bin/ccmake -# -# Install the tests program sources as examples -# -BASE_DIR = $(datadir)/doc -DOC_MODULE = libxml2-$(VERSION) -EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming + +# Default target executed when no arguments are given to make. +default_target: all + +# Special rule for the target edit_cache +edit_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/Extras/LibXML && /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) + +# Special rule for the target edit_cache +edit_cache/fast: edit_cache + +# Special rule for the target install +install: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/Extras/LibXML && /usr/bin/cmake -P cmake_install.cmake + +# Special rule for the target install +install/fast: preinstall/fast + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/Extras/LibXML && /usr/bin/cmake -P cmake_install.cmake + +# Special rule for the target rebuild_cache +rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/Extras/LibXML && /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) + +# Special rule for the target rebuild_cache +rebuild_cache/fast: rebuild_cache + +#============================================================================= +# Special targets provided by cmake. + +# Suppress display of executed commands. +$(VERBOSE).SILENT: + +# Disable implicit rules so canoncical targets will work. .SUFFIXES: -.SUFFIXES: .c .lo .o .obj -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 -libxml2.spec: $(top_builddir)/config.status $(srcdir)/libxml.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -xml2-config: $(top_builddir)/config.status $(srcdir)/xml2-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -libxml-2.0.pc: $(top_builddir)/config.status $(srcdir)/libxml-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -libxml-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libxml-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libxml2.la: $(libxml2_la_OBJECTS) $(libxml2_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libxml2_la_LDFLAGS) $(libxml2_la_OBJECTS) $(libxml2_la_LIBADD) $(LIBS) -testdso.la: $(testdso_la_OBJECTS) $(testdso_la_DEPENDENCIES) - $(LINK) $(testdso_la_LDFLAGS) $(testdso_la_OBJECTS) $(testdso_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -runsuite$(EXEEXT): $(runsuite_OBJECTS) $(runsuite_DEPENDENCIES) - @rm -f runsuite$(EXEEXT) - $(LINK) $(runsuite_LDFLAGS) $(runsuite_OBJECTS) $(runsuite_LDADD) $(LIBS) -runtest$(EXEEXT): $(runtest_OBJECTS) $(runtest_DEPENDENCIES) - @rm -f runtest$(EXEEXT) - $(LINK) $(runtest_LDFLAGS) $(runtest_OBJECTS) $(runtest_LDADD) $(LIBS) -testAutomata$(EXEEXT): $(testAutomata_OBJECTS) $(testAutomata_DEPENDENCIES) - @rm -f testAutomata$(EXEEXT) - $(LINK) $(testAutomata_LDFLAGS) $(testAutomata_OBJECTS) $(testAutomata_LDADD) $(LIBS) -testC14N$(EXEEXT): $(testC14N_OBJECTS) $(testC14N_DEPENDENCIES) - @rm -f testC14N$(EXEEXT) - $(LINK) $(testC14N_LDFLAGS) $(testC14N_OBJECTS) $(testC14N_LDADD) $(LIBS) -testHTML$(EXEEXT): $(testHTML_OBJECTS) $(testHTML_DEPENDENCIES) - @rm -f testHTML$(EXEEXT) - $(LINK) $(testHTML_LDFLAGS) $(testHTML_OBJECTS) $(testHTML_LDADD) $(LIBS) -testModule$(EXEEXT): $(testModule_OBJECTS) $(testModule_DEPENDENCIES) - @rm -f testModule$(EXEEXT) - $(LINK) $(testModule_LDFLAGS) $(testModule_OBJECTS) $(testModule_LDADD) $(LIBS) -testReader$(EXEEXT): $(testReader_OBJECTS) $(testReader_DEPENDENCIES) - @rm -f testReader$(EXEEXT) - $(LINK) $(testReader_LDFLAGS) $(testReader_OBJECTS) $(testReader_LDADD) $(LIBS) -testRegexp$(EXEEXT): $(testRegexp_OBJECTS) $(testRegexp_DEPENDENCIES) - @rm -f testRegexp$(EXEEXT) - $(LINK) $(testRegexp_LDFLAGS) $(testRegexp_OBJECTS) $(testRegexp_LDADD) $(LIBS) -testRelax$(EXEEXT): $(testRelax_OBJECTS) $(testRelax_DEPENDENCIES) - @rm -f testRelax$(EXEEXT) - $(LINK) $(testRelax_LDFLAGS) $(testRelax_OBJECTS) $(testRelax_LDADD) $(LIBS) -testSAX$(EXEEXT): $(testSAX_OBJECTS) $(testSAX_DEPENDENCIES) - @rm -f testSAX$(EXEEXT) - $(LINK) $(testSAX_LDFLAGS) $(testSAX_OBJECTS) $(testSAX_LDADD) $(LIBS) -testSchemas$(EXEEXT): $(testSchemas_OBJECTS) $(testSchemas_DEPENDENCIES) - @rm -f testSchemas$(EXEEXT) - $(LINK) $(testSchemas_LDFLAGS) $(testSchemas_OBJECTS) $(testSchemas_LDADD) $(LIBS) -testThreads$(EXEEXT): $(testThreads_OBJECTS) $(testThreads_DEPENDENCIES) - @rm -f testThreads$(EXEEXT) - $(LINK) $(testThreads_LDFLAGS) $(testThreads_OBJECTS) $(testThreads_LDADD) $(LIBS) -testURI$(EXEEXT): $(testURI_OBJECTS) $(testURI_DEPENDENCIES) - @rm -f testURI$(EXEEXT) - $(LINK) $(testURI_LDFLAGS) $(testURI_OBJECTS) $(testURI_LDADD) $(LIBS) -testXPath$(EXEEXT): $(testXPath_OBJECTS) $(testXPath_DEPENDENCIES) - @rm -f testXPath$(EXEEXT) - $(LINK) $(testXPath_LDFLAGS) $(testXPath_OBJECTS) $(testXPath_LDADD) $(LIBS) -testapi$(EXEEXT): $(testapi_OBJECTS) $(testapi_DEPENDENCIES) - @rm -f testapi$(EXEEXT) - $(LINK) $(testapi_LDFLAGS) $(testapi_OBJECTS) $(testapi_LDADD) $(LIBS) -xmlcatalog$(EXEEXT): $(xmlcatalog_OBJECTS) $(xmlcatalog_DEPENDENCIES) - @rm -f xmlcatalog$(EXEEXT) - $(LINK) $(xmlcatalog_LDFLAGS) $(xmlcatalog_OBJECTS) $(xmlcatalog_LDADD) $(LIBS) -xmllint$(EXEEXT): $(xmllint_OBJECTS) $(xmllint_DEPENDENCIES) - @rm -f xmllint$(EXEEXT) - $(LINK) $(xmllint_LDFLAGS) $(xmllint_OBJECTS) $(xmllint_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -include ./$(DEPDIR)/DOCBparser.Plo -include ./$(DEPDIR)/HTMLparser.Plo -include ./$(DEPDIR)/HTMLtree.Plo -include ./$(DEPDIR)/SAX.Plo -include ./$(DEPDIR)/SAX2.Plo -include ./$(DEPDIR)/c14n.Plo -include ./$(DEPDIR)/catalog.Plo -include ./$(DEPDIR)/chvalid.Plo -include ./$(DEPDIR)/debugXML.Plo -include ./$(DEPDIR)/dict.Plo -include ./$(DEPDIR)/encoding.Plo -include ./$(DEPDIR)/entities.Plo -include ./$(DEPDIR)/error.Plo -include ./$(DEPDIR)/globals.Plo -include ./$(DEPDIR)/hash.Plo -include ./$(DEPDIR)/legacy.Plo -include ./$(DEPDIR)/list.Plo -include ./$(DEPDIR)/nanoftp.Plo -include ./$(DEPDIR)/nanohttp.Plo -include ./$(DEPDIR)/parser.Plo -include ./$(DEPDIR)/parserInternals.Plo -include ./$(DEPDIR)/pattern.Plo -include ./$(DEPDIR)/relaxng.Plo -include ./$(DEPDIR)/runsuite.Po -include ./$(DEPDIR)/runtest.Po -include ./$(DEPDIR)/schematron.Plo -include ./$(DEPDIR)/testAutomata.Po -include ./$(DEPDIR)/testC14N.Po -include ./$(DEPDIR)/testHTML.Po -include ./$(DEPDIR)/testModule.Po -include ./$(DEPDIR)/testReader.Po -include ./$(DEPDIR)/testRegexp.Po -include ./$(DEPDIR)/testRelax.Po -include ./$(DEPDIR)/testSAX.Po -include ./$(DEPDIR)/testSchemas.Po -include ./$(DEPDIR)/testThreads.Po -include ./$(DEPDIR)/testURI.Po -include ./$(DEPDIR)/testXPath.Po -include ./$(DEPDIR)/testapi.Po -include ./$(DEPDIR)/testdso.Plo -include ./$(DEPDIR)/threads.Plo -include ./$(DEPDIR)/tree.Plo -include ./$(DEPDIR)/trio.Plo -include ./$(DEPDIR)/triostr.Plo -include ./$(DEPDIR)/uri.Plo -include ./$(DEPDIR)/valid.Plo -include ./$(DEPDIR)/xinclude.Plo -include ./$(DEPDIR)/xlink.Plo -include ./$(DEPDIR)/xmlIO.Plo -include ./$(DEPDIR)/xmlcatalog.Po -include ./$(DEPDIR)/xmllint.Po -include ./$(DEPDIR)/xmlmemory.Plo -include ./$(DEPDIR)/xmlmodule.Plo -include ./$(DEPDIR)/xmlreader.Plo -include ./$(DEPDIR)/xmlregexp.Plo -include ./$(DEPDIR)/xmlsave.Plo -include ./$(DEPDIR)/xmlschemas.Plo -include ./$(DEPDIR)/xmlschemastypes.Plo -include ./$(DEPDIR)/xmlstring.Plo -include ./$(DEPDIR)/xmlunicode.Plo -include ./$(DEPDIR)/xmlwriter.Plo -include ./$(DEPDIR)/xpath.Plo -include ./$(DEPDIR)/xpointer.Plo - -.c.o: - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c $< - -.c.obj: - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: - if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -install-man3: $(man3_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)" - @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.3*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 3*) ;; \ - *) ext='3' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ - done -uninstall-man3: - @$(NORMAL_UNINSTALL) - @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.3*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 3*) ;; \ - *) ext='3' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ - done -install-confexecDATA: $(confexec_DATA) - @$(NORMAL_INSTALL) - test -z "$(confexecdir)" || $(mkdir_p) "$(DESTDIR)$(confexecdir)" - @list='$(confexec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(confexecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confexecdir)/$$f'"; \ - $(confexecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confexecdir)/$$f"; \ - done - -uninstall-confexecDATA: - @$(NORMAL_UNINSTALL) - @list='$(confexec_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(confexecdir)/$$f'"; \ - rm -f "$(DESTDIR)$(confexecdir)/$$f"; \ - done -install-m4dataDATA: $(m4data_DATA) - @$(NORMAL_INSTALL) - test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)" - @list='$(m4data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ - $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ - done - -uninstall-m4dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(m4data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ - done -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/example $(distdir)/include/libxml $(distdir)/python - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local -check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ - config.h -install-binPROGRAMS: install-libLTLIBRARIES - -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(confexecdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-data-local install-m4dataDATA install-man \ - install-pkgconfigDATA - -install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-confexecDATA install-libLTLIBRARIES - -install-info: install-info-recursive - -install-man: install-man1 install-man3 - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-confexecDATA uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-m4dataDATA uninstall-man \ - uninstall-pkgconfigDATA - -uninstall-info: uninstall-info-recursive - -uninstall-man: uninstall-man1 uninstall-man3 - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am check-local clean clean-binPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ - dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-binSCRIPTS \ - install-confexecDATA install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES install-m4dataDATA \ - install-man install-man1 install-man3 install-pkgconfigDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-confexecDATA uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-m4dataDATA uninstall-man \ - uninstall-man1 uninstall-man3 uninstall-pkgconfigDATA - - -# that one forces the rebuild when "make rebuild" is run on doc/ -rebuild_testapi: - -@(if [ "$(PYTHON)" != "" ] ; then \ - $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) - -# that one is just to make sure it is rebuilt if missing -# but adding the dependances generate mess -testapi.c: - -@(if [ "$(PYTHON)" != "" ] ; then \ - $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) - -#testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c -#testOOM_LDFLAGS = -#testOOM_DEPENDENCIES = $(DEPS) -#testOOM_LDADD= $(LDADDS) - -check-local: all tests - -testall : tests SVGtests SAXtests - -tests: XMLtests XMLenttests NStests IDtests Errtests APItests Readertests SAXtests XMLPushtests HTMLtests HTMLPushtests Validtests URItests Patterntests XPathtests XPtrtests XIncludetests C14Ntests Scripttests Catatests Regexptests Automatatests Schemastests Relaxtests Schematrontests Timingtests VTimingtests RelaxNGPythonTests SchemasPythonTests ModuleTests - @(if [ "python" != "" ] ; then cd python ; \ - $(MAKE) MAKEFLAGS+=--silent tests ; fi) - @(cd doc/examples ; $(MAKE) MAKEFLAGS+=--silent tests) - -valgrind: - @echo '## Running the regression tests under Valgrind' - @echo '## Go get a cup of coffee it is gonna take a while ...' - $(MAKE) CHECKER='valgrind' tests - -APItests: testapi$(EXEEXT) - @echo "## Running the API regression tests this may take a little while" - -@($(CHECKER) $(top_builddir)/testapi -q) - -HTMLtests : testHTML$(EXEEXT) - @(echo > .memdump) - @echo "## HTML regression tests" - -@(for i in $(srcdir)/test/HTML/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \ - else \ - log=`$(CHECKER) $(top_builddir)/testHTML $$i > result.$$name 2> error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/HTML/$$name result.$$name ; \ - diff -b $(srcdir)/result/HTML/$$name.err error.$$name ; \ - $(CHECKER) $(top_builddir)/testHTML result.$$name > result2.$$name 2>error.$$name ; \ - diff result.$$name result2.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result2.$$name error.$$name ; \ - fi ; fi ; done) - -HTMLPushtests : testHTML$(EXEEXT) - @echo "## Push HTML regression tests" - -@(for i in $(srcdir)/test/HTML/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML --push $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \ - else \ - log=`$(CHECKER) $(top_builddir)/testHTML --push $$i > result.$$name 2> error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/HTML/$$name result.$$name ; \ - cut -b 1-15 $(srcdir)/result/HTML/$$name.err > errorcut.$$name; \ - cut -b 1-15 error.$$name > errorcut2.$$name; \ - diff -b errorcut.$$name errorcut2.$$name ; \ - $(CHECKER) $(top_builddir)/testHTML --push result.$$name > result2.$$name 2>error.$$name ; \ - diff result.$$name result2.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result2.$$name error.$$name errorcut.$$name errorcut2.$$name ; \ - fi ; fi ; done) - @echo "## HTML SAX regression tests" - -@(for i in $(srcdir)/test/HTML/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/HTML/$$name.sax ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \ - else \ - log=`$(CHECKER) $(top_builddir)/testHTML --sax $$i > result.$$name.sax ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/HTML/$$name.sax result.$$name.sax` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name.sax ; \ - fi ; fi ; done) - @echo "## Push HTML SAX regression tests" - -@(for i in $(srcdir)/test/HTML/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML --push --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \ - else \ - log=`$(CHECKER) $(top_builddir)/testHTML --push --sax $$i 2>&1 > result.$$name.sax ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/HTML/$$name.sax result.$$name.sax` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name.sax ; \ - fi ; fi ; done) - -XMLtests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## XML regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff result.$$name result2.$$name` ;\ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - @echo "## XML regression tests on memory" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --memory $$i > $(srcdir)/result/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --memory $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint --memory result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"`; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - diff result.$$name result2.$$name ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - -XMLPushtests: xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## XML push regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --push $$i > $(srcdir)/result/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --push $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint --push result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff result.$$name result2.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - -NStests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## XML Namespaces regression tests" - -@(for i in $(srcdir)/test/namespaces/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/namespaces/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i \ - 2> $(srcdir)/result/namespaces/$$name.err \ - > $(srcdir)/result/namespaces/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/namespaces/$$name result.$$name ; \ - diff $(srcdir)/result/namespaces/$$name.err error.$$name`; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -IDtests : xmllint$(EXEEXT) testXPath$(EXEEXT) - @(echo > .memdump) - @echo "## xml:id regression tests" - -@(for i in $(srcdir)/test/xmlid/id_*.xml ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/xmlid/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" \ - 2> $(srcdir)/result/xmlid/$$name.err \ - > $(srcdir)/result/xmlid/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" 2> error.$$name > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/xmlid/$$name result.$$name ; \ - diff $(srcdir)/result/xmlid/$$name.err error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -Errtests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Error cases regression tests" - -@(for i in $(srcdir)/test/errors/*.xml ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/errors/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i \ - 2> $(srcdir)/result/errors/$$name.err \ - > $(srcdir)/result/errors/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/errors/$$name result.$$name ; \ - diff $(srcdir)/result/errors/$$name.err error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - @echo "## Error cases stream regression tests" - -@(for i in $(srcdir)/test/errors/*.xml ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/errors/$$name.str ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --stream $$i \ - 2> $(srcdir)/result/errors/$$name.str \ - > /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --stream $$i 2> error.$$name > /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/errors/$$name.str error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm error.$$name ; \ - fi ; fi ; done) - -Docbtests : xmllint$(EXEEXT) - -XMLenttests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## XML entity subst regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/noent/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --noent $$i > $(srcdir)/result/noent/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --noent $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff $(srcdir)/result/noent/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint --noent result.$$name 2>&1 > result2.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff result.$$name result2.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - -URItests : testURI$(EXEEXT) - @(echo > .memdump) - @echo "## URI module regression tests" - -@(for i in $(srcdir)/test/URI/*.data ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/URI/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testURI -base 'http://foo.com/path/to/index.html?orig#help' < $$i > $(srcdir)/result/URI/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/testURI -base 'http://foo.com/path/to/index.html?orig#help' < $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/URI/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -@(for i in $(srcdir)/test/URI/*.uri ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/URI/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testURI < $$i > $(srcdir)/result/URI/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/testURI < $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/URI/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -XPathtests : testXPath$(EXEEXT) - @(echo > .memdump) - @echo "## XPath regression tests" - -@(if [ "`$(top_builddir)/testXPath | grep 'support not compiled in'`" != "" ] ; \ - then echo Skipping debug not compiled in ; exit 0 ; fi ; \ - for i in $(srcdir)/test/XPath/expr/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/XPath/expr/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testXPath -f --expr $$i > $(srcdir)/result/XPath/expr/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XPath/expr/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done ; \ - for i in $(srcdir)/test/XPath/docs/* ; do \ - if [ ! -d $$i ] ; then \ - doc=`basename $$i`; \ - for j in $(srcdir)/test/XPath/tests/$$doc* ; do \ - if [ ! -f $$j ] ; then continue ; fi ; \ - name=`basename $$j`; \ - if [ ! -d $$j ] ; then \ - if [ ! -f $(srcdir)/result/XPath/tests/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j > $(srcdir)/result/XPath/tests/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XPath/tests/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done ; fi ; done) - -XPtrtests : testXPath$(EXEEXT) - @(echo > .memdump) - @echo "## XPointer regression tests" - -@(if [ "`$(top_builddir)/testXPath | grep 'support not compiled in'`" != "" ] ; \ - then echo Skipping debug not compiled in ; exit 0 ; fi ; \ - for i in $(srcdir)/test/XPath/docs/* ; do \ - if [ ! -d $$i ] ; then \ - doc=`basename $$i`; \ - for j in $(srcdir)/test/XPath/xptr/$$doc* ; do \ - if [ ! -f $$j ] ; then continue ; fi ; \ - name=`basename $$j`; \ - if [ ! -d $$j ] ; then \ - if [ ! -f $(srcdir)/result/XPath/xptr/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > $(srcdir)/result/XPath/xptr/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - else \ - log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XPath/xptr/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done ; fi ; done) - -XIncludetests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## XInclude regression tests" - -@(for i in $(srcdir)/test/XInclude/docs/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > result.$$name 2>error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XInclude/$$name result.$$name ; \ - diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -@(for i in $(srcdir)/test/XInclude/docs/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode $$i > result.$$name 2>error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XInclude/$$name result.$$name ; \ - diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - @(echo > .memdump) - @echo "## XInclude xmlReader regression tests" - -@(for i in $(srcdir)/test/XInclude/docs/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/XInclude/$$name.rdr ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \ - diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -@(for i in $(srcdir)/test/XInclude/docs/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/XInclude/$$name.rdr ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode --stream --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \ - diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -Scripttests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Scripts regression tests" - @echo "## Some of the base computations may be different if srcdir != ." - -@(for i in $(srcdir)/test/scripts/*.script ; do \ - name=`basename $$i .script`; \ - xml=$(srcdir)/test/scripts/`basename $$i .script`.xml; \ - if [ -f $$xml ] ; then \ - if [ ! -f $(srcdir)/result/scripts/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --shell $$xml < $$i > $(srcdir)/result/scripts/$$name 2> $(srcdir)/result/scripts/$$name.err ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --shell $$xml < $$i > result.$$name 2> result.$$name.err ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/scripts/$$name result.$$name ; \ - diff $(srcdir)/result/scripts/$$name.err result.$$name.err` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name result.$$name.err ; \ - fi ; fi ; done) - -Catatests : xmlcatalog$(EXEEXT) - @(echo > .memdump) - @echo "## Catalog regression tests" - -@(for i in $(srcdir)/test/catalogs/*.script ; do \ - name=`basename $$i .script`; \ - xml=$(srcdir)/test/catalogs/`basename $$i .script`.xml; \ - if [ -f $$xml ] ; then \ - if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > $(srcdir)/result/catalogs/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/catalogs/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -@(for i in $(srcdir)/test/catalogs/*.script ; do \ - name=`basename $$i .script`; \ - sgml=$(srcdir)/test/catalogs/`basename $$i .script`.sgml; \ - if [ -f $$sgml ] ; then \ - if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmlcatalog --shell $$sgml < $$i > $(srcdir)/result/catalogs/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmlcatalog --shell $$sgml < $$i > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/catalogs/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## Add and del operations on XML Catalogs" - -@($(CHECKER) $(top_builddir)/xmlcatalog --create --noout $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid sysid $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid2 sysid2 $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid3 sysid3 $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff result/catalogs/mycatalog.full $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid3 $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid2 $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - diff result/catalogs/mycatalog.empty $(srcdir)/result/catalogs/mycatalog; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - rm -f $(srcdir)/result/catalogs/mycatalog) - -SVGtests : xmllint$(EXEEXT) - @echo "## SVG parsing regression tests" - -@(for i in $(srcdir)/test/SVG/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/SVG/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/SVG/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - echo Testing $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/SVG/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint result.$$name > result2.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff result.$$name result2.$$name ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - -Threadtests : testThreads$(EXEEXT) - @echo "## Threaded regression tests" - -@($(CHECKER) $(top_builddir)/testThreads ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ - exit 0) - -Readertests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Reader regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nonet --debug --stream $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.rdr result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## Reader on memory regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --memory --nonet --debug --stream $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --memory --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.rdr result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @(echo > .memdump) - @echo "## Walker regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nonet --debug --walker $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nonet --debug --walker $$i > result.$$name 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.rdr result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## Reader entities substitution regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.rde ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > $(srcdir)/result/$$name.rde 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.rde result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -SAXtests : testSAX$(EXEEXT) - @(echo > .memdump) - @echo "## SAX1 callbacks regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.sax ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testSAX $$i > $(srcdir)/result/$$name.sax 2> /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testSAX $$i > result.$$name 2> /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.sax result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## SAX2 callbacks regression tests" - -@(for i in $(srcdir)/test/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/$$name.sax2 ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testSAX --sax2 $$i > $(srcdir)/result/$$name.sax2 2> /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testSAX --sax2 $$i > result.$$name 2> /dev/null ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/$$name.sax2 result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -Validtests : xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Valid documents regression tests" - -@(for i in $(srcdir)/test/VCM/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - log=`$(CHECKER) $(top_builddir)/xmllint --valid --noout --nowarning $$i ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"`;\ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - fi ; done ; exit 0) - @echo "## Validity checking regression tests" - -@(for i in $(srcdir)/test/VC/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/VC/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --noout --valid $$i 2> $(srcdir)/result/VC/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --noout --valid $$i 2> result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/VC/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## General documents valid regression tests" - -@(for i in $(srcdir)/test/valid/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/valid/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --valid $$i > $(srcdir)/result/valid/$$name 2>$(srcdir)/result/valid/$$name.err ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint --valid $$i > result.$$name 2>error.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/valid/$$name result.$$name ; \ - diff $(srcdir)/result/valid/$$name.err error.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) - -Regexptests: testRegexp$(EXEEXT) - @(echo > .memdump) - @echo "## Regexp regression tests" - -@(for i in $(srcdir)/test/regexp/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/regexp/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testRegexp -i $$i > $(srcdir)/result/regexp/$$name; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testRegexp -i $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/regexp/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - @echo "## Formal expresssions regression tests" - -@(for i in $(srcdir)/test/expr/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/expr/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testRegexp --expr -i $$i > $(srcdir)/result/expr/$$name; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testRegexp --expr -i $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/expr/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -Automatatests: testAutomata$(EXEEXT) - @(echo > .memdump) - @echo "## Automata regression tests" - -@(for i in $(srcdir)/test/automata/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/automata/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testAutomata $$i > $(srcdir)/result/automata/$$name; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testAutomata $$i 2>&1 > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/automata/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done) - -$(srcdir)/dba100000.xml: dbgenattr.pl - @echo "## generating dba100000.xml" - @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > $(srcdir)/dba100000.xml) - -Timingtests: xmllint$(EXEEXT) $(srcdir)/dba100000.xml - @echo "## Timing tests to try to detect performance" - @echo "## as well a memory usage breakage when streaming" - @echo "## 1/ using the file interface" - @echo "## 2/ using the memory interface" - @echo "## 3/ repeated DOM parsing" - @echo "## 4/ repeated DOM validation" - -@($(top_builddir)/xmllint --stream --timing $(srcdir)/dba100000.xml; \ - MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - exit 0) - -@($(top_builddir)/xmllint --stream --timing --memory $(srcdir)/dba100000.xml; \ - MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - exit 0) - -@($(top_builddir)/xmllint --noout --timing --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \ - MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - exit 0) - -VTimingtests: xmllint$(EXEEXT) - -@($(top_builddir)/xmllint --noout --timing --valid --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \ - MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - exit 0) - -C14Ntests : testC14N$(EXEEXT) - @echo "## C14N and XPath regression tests" - -@(for m in with-comments without-comments exc-without-comments ; do \ - for i in $(srcdir)/test/c14n/$$m/*.xml ; do \ - if [ ! -d $$i ] ; then \ - name=`basename $$i .xml`; \ - cmdline="$(CHECKER) $(top_builddir)/testC14N --$$m $$i"; \ - if [ -f $(srcdir)/test/c14n/$$m/$$name.xpath ] ; then \ - cmdline="$$cmdline $(srcdir)/test/c14n/$$m/$$name.xpath"; \ - if [ -f $(srcdir)/test/c14n/$$m/$$name.ns ] ; then \ - cmdline="$$cmdline '`cat $(srcdir)/test/c14n/$$m/$$name.ns`'"; \ - fi; \ - fi; \ - $$cmdline > $(srcdir)/test/c14n/test.tmp; \ - if [ $$? -eq 0 ]; then \ - diff $(srcdir)/result/c14n/$$m/$$name $(srcdir)/test/c14n/test.tmp; \ - if [ $$? -ne 0 ]; then \ - echo "Test $$m/$$name failed"; \ - cat $(srcdir)/test/c14n/test.tmp; \ - fi; \ - else \ - echo "C14N failed"; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - fi; \ - rm -f $(srcdir)/test/c14n/test.tmp; \ - done; \ - done) - -Schemastests: testSchemas$(EXEEXT) - @(echo > .memdump) - @echo "## Schemas regression tests" - -@(for i in $(srcdir)/test/schemas/*_*.xsd ; do \ - name=`basename $$i | sed 's+_.*++'`; \ - sno=`basename $$i | sed 's+.*_\(.*\).xsd+\1+'`; \ - for j in $(srcdir)/test/schemas/"$$name"_*.xml ; do \ - if [ -f $$j ] ; then \ - xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \ - if [ ! -f $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" ]; \ - then \ - echo New test file "$$name"_"$$sno"_"$$xno" ; \ - $(CHECKER) $(top_builddir)/testSchemas $$i $$j \ - > $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" \ - 2> $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno".err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/testSchemas $$i $$j \ - > res.$$name 2> err.$$name;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" \ - res.$$name;\ - diff $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno".err \ - err.$$name;\ - grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo "$$name"_"$$sno"_"$$xno" result ; echo $$log ; fi ; \ - rm res.$$name err.$$name ; \ - fi ; fi ;\ - done; done) - -Relaxtests: xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Relax-NG regression tests" - -@(for i in $(srcdir)/test/relaxng/*.rng ; do \ - name=`basename $$i | sed 's+\.rng++'`; \ - if [ ! -f $(srcdir)/result/relaxng/"$$name"_valid ] ; then \ - echo New schemas $$name ; \ - $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $(srcdir)/test/relaxng/tutorA.rng $$i \ - > $(srcdir)/result/relaxng/"$$name"_valid \ - 2> $(srcdir)/result/relaxng/"$$name"_err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $(srcdir)/test/relaxng/tutorA.rng $$i \ - > res.$$name 2> err.$$name;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/relaxng/"$$name"_valid \ - res.$$name;\ - diff $(srcdir)/result/relaxng/"$$name"_err \ - err.$$name | grep -v "error detected at";\ - grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo schemas $$name result ; echo $$log ; fi ; \ - rm res.$$name err.$$name ; \ - fi; \ - for j in $(srcdir)/test/relaxng/"$$name"_*.xml ; do \ - if [ -f $$j ] ; then \ - xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \ - if [ ! -f $(srcdir)/result/relaxng/"$$name"_"$$xno" ]; \ - then \ - echo New test file "$$name"_"$$xno" ; \ - $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \ - > $(srcdir)/result/relaxng/"$$name"_"$$xno" \ - 2> $(srcdir)/result/relaxng/"$$name"_"$$xno".err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \ - > res.$$name 2> err.$$name;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/relaxng/"$$name"_"$$xno" \ - res.$$name;\ - diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \ - err.$$name | grep -v "error detected at";\ - grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \ - rm res.$$name err.$$name ; \ - fi ; fi ; \ - done; done) - @echo "## Relax-NG streaming regression tests" - -@(for i in $(srcdir)/test/relaxng/*.rng ; do \ - name=`basename $$i | sed 's+\.rng++'`; \ - for j in $(srcdir)/test/relaxng/"$$name"_*.xml ; do \ - if [ -f $$j ] ; then \ - xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \ - if [ ! -f $(srcdir)/result/relaxng/"$$name"_"$$xno" ]; \ - then \ - echo New test file "$$name"_"$$xno" ; \ - $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \ - > $(srcdir)/result/relaxng/"$$name"_"$$xno" \ - 2> $(srcdir)/result/relaxng/"$$name"_"$$xno".err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --stream --relaxng $$i $$j \ - > res.$$name 2> err.$$name;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/relaxng/"$$name"_"$$xno" res.$$name;\ - if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" -a "$$name" != "307377" ] ; then \ - diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \ - err.$$name | grep -v "error detected at";\ - fi ; grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \ - rm res.$$name err.$$name ; \ - fi ; fi ; \ - done; done) - -Schematrontests: xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Schematron regression tests" - -@(for i in $(srcdir)/test/schematron/*.sct ; do \ - name=`basename $$i | sed 's+\.sct++'`; \ - for j in $(srcdir)/test/schematron/"$$name"_*.xml ; do \ - if [ -f $$j ] ; then \ - xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \ - if [ ! -f $(srcdir)/result/schematron/"$$name"_"$$xno" ]; \ - then \ - echo New test file "$$name"_"$$xno" ; \ - $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \ - > $(srcdir)/result/schematron/"$$name"_"$$xno" \ - 2> $(srcdir)/result/schematron/"$$name"_"$$xno".err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \ - > res.$$name 2> err.$$name;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/schematron/"$$name"_"$$xno" \ - res.$$name;\ - diff $(srcdir)/result/schematron/"$$name"_"$$xno".err \ - err.$$name | grep -v "error detected at";\ - grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \ - rm res.$$name err.$$name ; \ - fi ; fi ; \ - done; done) - -RelaxNGPythonTests: - @(if [ -x $(PYTHON) ] ; then \ - PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH ; \ - export PYTHONPATH; \ - LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ - export LD_LIBRARY_PATH; \ - echo "## Relax-NG Python based test suite 1" ; \ - $(CHECKER) $(PYTHON) $(srcdir)/check-relaxng-test-suite.py ; \ - echo "## Relax-NG Python based test suite 2" ; \ - $(CHECKER) $(PYTHON) $(srcdir)/check-relaxng-test-suite2.py ; \ - fi) - -SchemasPythonTests: - @(if [ -x $(PYTHON) ] ; then \ - PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH; \ - export PYTHONPATH; \ - LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ - export LD_LIBRARY_PATH; \ - echo "## XML Schemas datatypes Python based test suite" ; \ - echo "## It is normal to see 11 errors reported" ; \ - $(CHECKER) $(PYTHON) $(srcdir)/check-xsddata-test-suite.py ; \ - fi) - @(if [ -x $(PYTHON) -a -d xstc ] ; then cd xstc ; $(MAKE) CHECKER="$(CHECKER)" MAKEFLAGS+=--silent pytests ; fi) - -Patterntests: xmllint$(EXEEXT) - @(echo > .memdump) - @echo "## Pattern regression tests" - -@(for i in $(srcdir)/test/pattern/*.pat ; do \ - name=`basename $$i .pat`; \ - if [ -f $(srcdir)/test/pattern/$$name.xml ] ; then \ - if [ ! -f $(srcdir)/result/pattern/$$name ] ; then \ - rm -f result.$$name ; \ - echo New test file $$name ; \ - for pat in `cat $$i` ; do \ - $(CHECKER) $(top_builddir)/xmllint --walker --pattern $$pat $(srcdir)/test/pattern/$$name.xml >> $(srcdir)/result/pattern/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - done ;\ - else \ - rm -f result.$$name ; \ - lst=`cat $$i` ; \ - log=`for pat in $$lst ; do $(CHECKER) $(top_builddir)/xmllint --walker --pattern $$pat $(srcdir)/test/pattern/$$name.xml 2>&1 >> result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - done ;\ - diff $(srcdir)/result/pattern/$$name result.$$name` ; \ - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ - fi ; fi ; done ;) - -ModuleTests: testModule$(EXEEXT) testdso.la - @echo "## Module tests" - @(./testModule$(EXEEXT)) - -cleanup: - -@(find . -name .\#\* -exec rm {} \;) - -dist-hook: cleanup libxml2.spec - -cp libxml2.spec $(distdir) - (cd $(srcdir) ; tar -cf - --exclude CVS win32 macos vms bakefile test result) | (cd $(distdir); tar xf -) - -dist-source: distdir - $(AMTAR) -chof - --exclude Tests --exclude test --exclude result $(distdir) | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-sources+"`.tar.gz - -dist-test: distdir - (mkdir -p $(distdir)) - (cd $(srcdir) ; tar -cf - --exclude CVS xstc/Tests) | (cd $(distdir); tar xf -) - tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz - @(rm -rf $(distdir)/xstc/Test) - -cleantar: - @(rm -f libxml*.tar.gz COPYING.LIB) - -rpm: cleanup cleantar - @(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz) - -xml2Conf.sh: xml2Conf.sh.in Makefile - sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \ - -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \ - -e 's?\@VERSION\@?$(VERSION)?g' \ - -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \ - < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \ - && mv xml2Conf.tmp xml2Conf.sh - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE) - -/usr/bin/install -c -m 0644 $(srcdir)/Copyright $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE) - $(mkinstalldirs) $(DESTDIR)$(EXAMPLES_DIR) - -/usr/bin/install -c -m 0644 $(srcdir)/xmllint.c $(DESTDIR)$(EXAMPLES_DIR) - -/usr/bin/install -c -m 0644 $(srcdir)/testSAX.c $(DESTDIR)$(EXAMPLES_DIR) - -/usr/bin/install -c -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR) - -/usr/bin/install -c -m 0644 $(srcdir)/testXPath.c $(DESTDIR)$(EXAMPLES_DIR) - -tst: tst.c - $(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz - -sparse: clean - $(MAKE) CC=cgcc -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: + +.SUFFIXES: .hpux_make_needs_suffix_list + +# The main all target +all: cmake_check_build_system + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(CMAKE_COMMAND) -E cmake_progress_start /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/CMakeFiles $(CMAKE_ALL_PROGRESS) + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f CMakeFiles/Makefile2 Extras/LibXML/all + $(CMAKE_COMMAND) -E cmake_progress_start /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming/CMakeFiles 0 + +# The main clean target +clean: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f CMakeFiles/Makefile2 Extras/LibXML/clean + +# The main clean target +clean/fast: clean + +# Prepare targets for installation. +preinstall: all + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f CMakeFiles/Makefile2 Extras/LibXML/preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f CMakeFiles/Makefile2 Extras/LibXML/preinstall + +# clear depends +depend: + $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + +# Convenience name for target. +Extras/LibXML/CMakeFiles/LibXML.dir/rule: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f CMakeFiles/Makefile2 Extras/LibXML/CMakeFiles/LibXML.dir/rule + +# Convenience name for target. +LibXML: Extras/LibXML/CMakeFiles/LibXML.dir/rule + +# fast build rule for target. +LibXML/fast: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/build + +# target for object file +DOCBparser.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/DOCBparser.o + +# target for object file +HTMLparser.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/HTMLparser.o + +# target for object file +HTMLtree.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/HTMLtree.o + +# target for object file +SAX.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/SAX.o + +# target for object file +SAX2.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/SAX2.o + +# target for object file +c14n.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/c14n.o + +# target for object file +catalog.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/catalog.o + +# target for object file +chvalid.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/chvalid.o + +# target for object file +debugXML.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/debugXML.o + +# target for object file +dict.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/dict.o + +# target for object file +encoding.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/encoding.o + +# target for object file +entities.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/entities.o + +# target for object file +error.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/error.o + +# target for object file +globals.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/globals.o + +# target for object file +hash.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/hash.o + +# target for object file +legacy.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/legacy.o + +# target for object file +list.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/list.o + +# target for object file +nanoftp.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/nanoftp.o + +# target for object file +nanohttp.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/nanohttp.o + +# target for object file +parser.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/parser.o + +# target for object file +parserInternals.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/parserInternals.o + +# target for object file +pattern.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/pattern.o + +# target for object file +relaxng.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/relaxng.o + +# target for object file +runsuite.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/runsuite.o + +# target for object file +runtest.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/runtest.o + +# target for object file +schematron.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/schematron.o + +# target for object file +threads.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/threads.o + +# target for object file +tree.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/tree.o + +# target for object file +trio.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/trio.o + +# target for object file +trionan.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/trionan.o + +# target for object file +triostr.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/triostr.o + +# target for object file +uri.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/uri.o + +# target for object file +valid.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/valid.o + +# target for object file +xinclude.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xinclude.o + +# target for object file +xlink.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xlink.o + +# target for object file +xmlIO.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlIO.o + +# target for object file +xmlcatalog.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlcatalog.o + +# target for object file +xmllint.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmllint.o + +# target for object file +xmlmemory.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlmemory.o + +# target for object file +xmlmodule.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlmodule.o + +# target for object file +xmlreader.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlreader.o + +# target for object file +xmlregexp.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlregexp.o + +# target for object file +xmlsave.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlsave.o + +# target for object file +xmlschemas.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlschemas.o + +# target for object file +xmlschemastypes.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlschemastypes.o + +# target for object file +xmlstring.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlstring.o + +# target for object file +xmlunicode.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlunicode.o + +# target for object file +xmlwriter.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xmlwriter.o + +# target for object file +xpath.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xpath.o + +# target for object file +xpointer.o: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(MAKE) -f Extras/LibXML/CMakeFiles/LibXML.dir/build.make Extras/LibXML/CMakeFiles/LibXML.dir/xpointer.o + +# Help Target +help:: + @echo "The following are some of the valid targets for this Makefile:" + @echo "... all (the default if no target is provided)" + @echo "... clean" + @echo "... depend" + @echo "... LibXML" + @echo "... edit_cache" + @echo "... install" + @echo "... rebuild_cache" + @echo "... DOCBparser.o" + @echo "... HTMLparser.o" + @echo "... HTMLtree.o" + @echo "... SAX.o" + @echo "... SAX2.o" + @echo "... c14n.o" + @echo "... catalog.o" + @echo "... chvalid.o" + @echo "... debugXML.o" + @echo "... dict.o" + @echo "... encoding.o" + @echo "... entities.o" + @echo "... error.o" + @echo "... globals.o" + @echo "... hash.o" + @echo "... legacy.o" + @echo "... list.o" + @echo "... nanoftp.o" + @echo "... nanohttp.o" + @echo "... parser.o" + @echo "... parserInternals.o" + @echo "... pattern.o" + @echo "... relaxng.o" + @echo "... runsuite.o" + @echo "... runtest.o" + @echo "... schematron.o" + @echo "... threads.o" + @echo "... tree.o" + @echo "... trio.o" + @echo "... trionan.o" + @echo "... triostr.o" + @echo "... uri.o" + @echo "... valid.o" + @echo "... xinclude.o" + @echo "... xlink.o" + @echo "... xmlIO.o" + @echo "... xmlcatalog.o" + @echo "... xmllint.o" + @echo "... xmlmemory.o" + @echo "... xmlmodule.o" + @echo "... xmlreader.o" + @echo "... xmlregexp.o" + @echo "... xmlsave.o" + @echo "... xmlschemas.o" + @echo "... xmlschemastypes.o" + @echo "... xmlstring.o" + @echo "... xmlunicode.o" + @echo "... xmlwriter.o" + @echo "... xpath.o" + @echo "... xpointer.o" + + + +#============================================================================= +# Special targets to cleanup operation of make. + +# Special rule to run CMake to check the build system integrity. +# No rule that depends on this can have commands that come from listfiles +# because they might be regenerated. +cmake_check_build_system: + cd /Users/apple/develop/sourceforgebullet/branch/bullet-2.1_renaming && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + diff --git a/Extras/PhysicsInterface/CcdPhysics/CMakeLists.txt b/Extras/PhysicsInterface/CcdPhysics/CMakeLists.txt index 8c94bd9ce..ca40c6531 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CMakeLists.txt +++ b/Extras/PhysicsInterface/CcdPhysics/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ) ADD_LIBRARY(LibCcdPhysicsInterface @@ -8,4 +8,4 @@ ADD_LIBRARY(LibCcdPhysicsInterface ParallelIslandDispatcher.cpp ParallelPhysicsEnvironment.cpp SimulationIsland.cpp -) \ No newline at end of file +) diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp index 165a4735f..c5e79e10e 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp +++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp @@ -15,16 +15,16 @@ subject to the following restrictions: #include "CcdPhysicsController.h" -#include "Dynamics/RigidBody.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" #include "PHY_IMotionState.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "BroadphaseCollision/BroadphaseInterface.h" -#include "CollisionShapes/ConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" #include "CcdPhysicsEnvironment.h" -#include "SimdTransformUtil.h" +#include "LinearMath/SimdTransformUtil.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/ConeShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" class BP_Proxy; @@ -37,7 +37,7 @@ bool gDisableDeactivation = false; float gLinearSleepingTreshold = 0.8f; float gAngularSleepingTreshold = 1.0f; -#include "Dynamics/MassProps.h" +#include "BulletDynamics/Dynamics/btMassProps.h" SimdVector3 startVel(0,0,0);//-10000); CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h index 632d5d776..6e048e782 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h +++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h @@ -21,15 +21,15 @@ subject to the following restrictions: /// PHY_IPhysicsController is the abstract simplified Interface to a physical object. /// It contains the IMotionState and IDeformableMesh Interfaces. -#include "SimdVector3.h" -#include "SimdScalar.h" -#include "SimdMatrix3x3.h" -#include "SimdTransform.h" -#include "Dynamics/RigidBody.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdScalar.h" +#include "LinearMath/SimdMatrix3x3.h" +#include "LinearMath/SimdTransform.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" #include "PHY_IMotionState.h" -#include "BroadphaseCollision/BroadphaseProxy.h" //for CollisionShape access +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for CollisionShape access class CollisionShape; extern float gDeactivationTime; diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp index 543c43862..7259c7f38 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp +++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp @@ -20,62 +20,62 @@ subject to the following restrictions: #include "CcdPhysicsController.h" #include -#include "SimdTransform.h" -#include "Dynamics/RigidBody.h" -#include "BroadphaseCollision/BroadphaseInterface.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" +#include "LinearMath/SimdTransform.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" +#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" +#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h" -#include "CollisionDispatch/CollisionWorld.h" +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" -#include "CollisionShapes/ConvexShape.h" -#include "CollisionShapes/ConeShape.h" -#include "CollisionDispatch/SimulationIslandManager.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" +#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" -#include "BroadphaseCollision/Dispatcher.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "CollisionShapes/TriangleMeshShape.h" -#include "ConstraintSolver/SequentialImpulseConstraintSolver.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" +#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" //profiling/timings -#include "quickprof.h" +#include "LinearMath/GenQuickprof.h" -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "NarrowPhaseCollision/GjkConvexCast.h" -#include "NarrowPhaseCollision/ContinuousConvexCollision.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" -#include "CollisionDispatch/CollisionDispatcher.h" +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "PHY_IMotionState.h" -#include "CollisionDispatch/EmptyCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" -#include "CollisionShapes/SphereShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" bool useIslands = true; #ifdef NEW_BULLET_VEHICLE_SUPPORT -#include "Vehicle/RaycastVehicle.h" -#include "Vehicle/VehicleRaycaster.h" +#include "BulletDynamics/Vehicle/btRaycastVehicle.h" +#include "BulletDynamics/Vehicle/btVehicleRaycaster.h" -#include "Vehicle/WheelInfo.h" +#include "BulletDynamics/Vehicle/btWheelInfo.h" #include "PHY_IVehicle.h" RaycastVehicle::VehicleTuning gTuning; #endif //NEW_BULLET_VEHICLE_SUPPORT -#include "AabbUtil2.h" +#include "LinearMath/GenAabbUtil2.h" -#include "ConstraintSolver/ConstraintSolver.h" -#include "ConstraintSolver/Point2PointConstraint.h" -#include "ConstraintSolver/HingeConstraint.h" -#include "ConstraintSolver/Generic6DofConstraint.h" +#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h" +#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" +#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" //#include "BroadphaseCollision/QueryDispatcher.h" @@ -87,7 +87,7 @@ void DrawRasterizerLine(const float* from,const float* to,int color); #endif -#include "ConstraintSolver/ContactConstraint.h" +#include "BulletDynamics/ConstraintSolver/btContactConstraint.h" #include @@ -1120,6 +1120,9 @@ public: { } + virtual ~DefaultVehicleRaycaster() + { + } /* struct VehicleRaycasterResult { VehicleRaycasterResult() :m_distFraction(-1.f){}; diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h index 2ff079b95..bab856c43 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h +++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h @@ -19,8 +19,8 @@ subject to the following restrictions: #include "PHY_IPhysicsEnvironment.h" #include class CcdPhysicsController; -#include "SimdVector3.h" -#include "SimdTransform.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" @@ -29,12 +29,12 @@ class TypedConstraint; class SimulationIslandManager; class CollisionDispatcher; class Dispatcher; -//#include "BroadphaseInterface.h" +//#include "btBroadphaseInterface.h" //switch on/off new vehicle support #define NEW_BULLET_VEHICLE_SUPPORT 1 -#include "ConstraintSolver/ContactSolverInfo.h" +#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" class WrapperVehicle; class PersistentManifold; diff --git a/Extras/PhysicsInterface/CcdPhysics/Jamfile b/Extras/PhysicsInterface/CcdPhysics/Jamfile index 504359594..87497faf8 100644 --- a/Extras/PhysicsInterface/CcdPhysics/Jamfile +++ b/Extras/PhysicsInterface/CcdPhysics/Jamfile @@ -4,7 +4,7 @@ IncludeDir Extras/PhysicsInterface/Common ; Library bulletccdphysics : [ Wildcard *.h *.cpp ] ; CFlags bulletccdphysics : [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] ; -LibDepends bulletccdphysics : bullet bulletphysicsinterfacecommon bulletdynamics ; +LibDepends bulletccdphysics : bulletcollision bulletphysicsinterfacecommon bulletdynamics ; InstallHeader [ Wildcard *.h ] : CcdPhysics ; diff --git a/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.cpp b/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.cpp index 12abc9126..1d31cf3db 100644 --- a/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.cpp +++ b/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.cpp @@ -17,14 +17,14 @@ subject to the following restrictions: #include "ParallelIslandDispatcher.h" -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "CollisionDispatch/ConvexConvexAlgorithm.h" -#include "CollisionDispatch/EmptyCollisionAlgorithm.h" -#include "CollisionDispatch/ConvexConcaveCollisionAlgorithm.h" -#include "CollisionDispatch/CompoundCollisionAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" -#include "CollisionShapes/CollisionShape.h" -#include "CollisionDispatch/CollisionObject.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include static int gNumManifold2 = 0; diff --git a/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.h b/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.h index 2a47ff619..123e79a53 100644 --- a/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.h +++ b/Extras/PhysicsInterface/CcdPhysics/ParallelIslandDispatcher.h @@ -16,18 +16,18 @@ subject to the following restrictions: #ifndef PARALLEL_ISLAND_DISPATCHER_H #define PARALLEL_ISLAND_DISPATCHER_H -#include "BroadphaseCollision/Dispatcher.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "CollisionDispatch/UnionFind.h" -#include "CollisionDispatch/ManifoldResult.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/CollisionDispatch/btUnionFind.h" +#include "BulletCollision/CollisionDispatch/btManifoldResult.h" -#include "BroadphaseCollision/BroadphaseProxy.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" #include class IDebugDraw; -#include "CollisionDispatch/CollisionCreateFunc.h" +#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" diff --git a/Extras/PhysicsInterface/CcdPhysics/ParallelPhysicsEnvironment.cpp b/Extras/PhysicsInterface/CcdPhysics/ParallelPhysicsEnvironment.cpp index c31b0512e..d974f67e2 100644 --- a/Extras/PhysicsInterface/CcdPhysics/ParallelPhysicsEnvironment.cpp +++ b/Extras/PhysicsInterface/CcdPhysics/ParallelPhysicsEnvironment.cpp @@ -18,9 +18,9 @@ subject to the following restrictions: #include "ParallelPhysicsEnvironment.h" #include "CcdPhysicsController.h" #include "ParallelIslandDispatcher.h" -#include "CollisionDispatch/CollisionWorld.h" -#include "ConstraintSolver/TypedConstraint.h" -#include "CollisionDispatch/SimulationIslandManager.h" +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" +#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" +#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" #include "SimulationIsland.h" diff --git a/Extras/PhysicsInterface/CcdPhysics/SimulationIsland.cpp b/Extras/PhysicsInterface/CcdPhysics/SimulationIsland.cpp index f313f8cf3..83bfb7bab 100644 --- a/Extras/PhysicsInterface/CcdPhysics/SimulationIsland.cpp +++ b/Extras/PhysicsInterface/CcdPhysics/SimulationIsland.cpp @@ -14,15 +14,15 @@ subject to the following restrictions: */ #include "SimulationIsland.h" -#include "SimdTransform.h" +#include "LinearMath/SimdTransform.h" #include "CcdPhysicsController.h" -#include "BroadphaseCollision/OverlappingPairCache.h" -#include "CollisionShapes/CollisionShape.h" -#include "BroadphaseCollision/Dispatcher.h" -#include "ConstraintSolver/ContactSolverInfo.h" -#include "ConstraintSolver/ConstraintSolver.h" -#include "ConstraintSolver/TypedConstraint.h" -#include "IDebugDraw.h" +#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" +#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h" +#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" +#include "LinearMath/GenIDebugDraw.h" extern float gContactBreakingTreshold; diff --git a/Extras/PhysicsInterface/Common/CMakeLists.txt b/Extras/PhysicsInterface/Common/CMakeLists.txt index 0f964b5c4..7aaecb726 100644 --- a/Extras/PhysicsInterface/Common/CMakeLists.txt +++ b/Extras/PhysicsInterface/Common/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common } +${BULLET_PHYSICS_SOURCE_DIR}src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common } ) ADD_LIBRARY(LibPhysicsCommonInterface @@ -7,4 +7,4 @@ ADD_LIBRARY(LibPhysicsCommonInterface PHY_IPhysicsController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp -) \ No newline at end of file +) diff --git a/LinearMath/Geometry.cpp b/Extras/SATConvexCollision/Geometry.cpp similarity index 100% rename from LinearMath/Geometry.cpp rename to Extras/SATConvexCollision/Geometry.cpp diff --git a/LinearMath/Geometry.h b/Extras/SATConvexCollision/Geometry.h similarity index 100% rename from LinearMath/Geometry.h rename to Extras/SATConvexCollision/Geometry.h diff --git a/LinearMath/Geometry.inl b/Extras/SATConvexCollision/Geometry.inl similarity index 100% rename from LinearMath/Geometry.inl rename to Extras/SATConvexCollision/Geometry.inl diff --git a/Bullet/NarrowPhaseCollision/Hull.cpp b/Extras/SATConvexCollision/Hull.cpp similarity index 100% rename from Bullet/NarrowPhaseCollision/Hull.cpp rename to Extras/SATConvexCollision/Hull.cpp diff --git a/Bullet/NarrowPhaseCollision/Hull.h b/Extras/SATConvexCollision/Hull.h similarity index 100% rename from Bullet/NarrowPhaseCollision/Hull.h rename to Extras/SATConvexCollision/Hull.h diff --git a/Bullet/NarrowPhaseCollision/Hull.inl b/Extras/SATConvexCollision/Hull.inl similarity index 100% rename from Bullet/NarrowPhaseCollision/Hull.inl rename to Extras/SATConvexCollision/Hull.inl diff --git a/Bullet/NarrowPhaseCollision/HullContactCollector.h b/Extras/SATConvexCollision/HullContactCollector.h similarity index 100% rename from Bullet/NarrowPhaseCollision/HullContactCollector.h rename to Extras/SATConvexCollision/HullContactCollector.h diff --git a/LinearMath/Maths.h b/Extras/SATConvexCollision/Maths.h similarity index 100% rename from LinearMath/Maths.h rename to Extras/SATConvexCollision/Maths.h diff --git a/LinearMath/Matrix.cpp b/Extras/SATConvexCollision/Matrix.cpp similarity index 100% rename from LinearMath/Matrix.cpp rename to Extras/SATConvexCollision/Matrix.cpp diff --git a/LinearMath/Matrix.h b/Extras/SATConvexCollision/Matrix.h similarity index 100% rename from LinearMath/Matrix.h rename to Extras/SATConvexCollision/Matrix.h diff --git a/LinearMath/Matrix.inl b/Extras/SATConvexCollision/Matrix.inl similarity index 100% rename from LinearMath/Matrix.inl rename to Extras/SATConvexCollision/Matrix.inl diff --git a/LinearMath/Memory2.h b/Extras/SATConvexCollision/Memory2.h similarity index 100% rename from LinearMath/Memory2.h rename to Extras/SATConvexCollision/Memory2.h diff --git a/LinearMath/Quat.cpp b/Extras/SATConvexCollision/Quat.cpp similarity index 100% rename from LinearMath/Quat.cpp rename to Extras/SATConvexCollision/Quat.cpp diff --git a/LinearMath/Quat.h b/Extras/SATConvexCollision/Quat.h similarity index 100% rename from LinearMath/Quat.h rename to Extras/SATConvexCollision/Quat.h diff --git a/LinearMath/Quat.inl b/Extras/SATConvexCollision/Quat.inl similarity index 100% rename from LinearMath/Quat.inl rename to Extras/SATConvexCollision/Quat.inl diff --git a/LinearMath/Scalar.cpp b/Extras/SATConvexCollision/Scalar.cpp similarity index 100% rename from LinearMath/Scalar.cpp rename to Extras/SATConvexCollision/Scalar.cpp diff --git a/LinearMath/Scalar.h b/Extras/SATConvexCollision/Scalar.h similarity index 100% rename from LinearMath/Scalar.h rename to Extras/SATConvexCollision/Scalar.h diff --git a/LinearMath/Scalar.inl b/Extras/SATConvexCollision/Scalar.inl similarity index 100% rename from LinearMath/Scalar.inl rename to Extras/SATConvexCollision/Scalar.inl diff --git a/Bullet/NarrowPhaseCollision/Shape.cpp b/Extras/SATConvexCollision/Shape.cpp similarity index 100% rename from Bullet/NarrowPhaseCollision/Shape.cpp rename to Extras/SATConvexCollision/Shape.cpp diff --git a/Bullet/NarrowPhaseCollision/Shape.h b/Extras/SATConvexCollision/Shape.h similarity index 100% rename from Bullet/NarrowPhaseCollision/Shape.h rename to Extras/SATConvexCollision/Shape.h diff --git a/LinearMath/Vector.cpp b/Extras/SATConvexCollision/Vector.cpp similarity index 100% rename from LinearMath/Vector.cpp rename to Extras/SATConvexCollision/Vector.cpp diff --git a/LinearMath/Vector.h b/Extras/SATConvexCollision/Vector.h similarity index 100% rename from LinearMath/Vector.h rename to Extras/SATConvexCollision/Vector.h diff --git a/LinearMath/Vector.inl b/Extras/SATConvexCollision/Vector.inl similarity index 100% rename from LinearMath/Vector.inl rename to Extras/SATConvexCollision/Vector.inl diff --git a/LinearMath/VectorBase.cpp b/Extras/SATConvexCollision/VectorBase.cpp similarity index 100% rename from LinearMath/VectorBase.cpp rename to Extras/SATConvexCollision/VectorBase.cpp diff --git a/LinearMath/VectorBase.h b/Extras/SATConvexCollision/VectorBase.h similarity index 100% rename from LinearMath/VectorBase.h rename to Extras/SATConvexCollision/VectorBase.h diff --git a/LinearMath/VectorBase.inl b/Extras/SATConvexCollision/VectorBase.inl similarity index 100% rename from LinearMath/VectorBase.inl rename to Extras/SATConvexCollision/VectorBase.inl diff --git a/Extras/quickstep/OdeConstraintSolver.cpp b/Extras/quickstep/OdeConstraintSolver.cpp index 00d9f70b9..be1dc0dd6 100644 --- a/Extras/quickstep/OdeConstraintSolver.cpp +++ b/Extras/quickstep/OdeConstraintSolver.cpp @@ -17,15 +17,15 @@ subject to the following restrictions: #include "OdeConstraintSolver.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "Dynamics/RigidBody.h" -#include "ContactConstraint.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "btContactConstraint.h" #include "Solve2LinearConstraint.h" -#include "ContactSolverInfo.h" +#include "btContactSolverInfo.h" #include "Dynamics/BU_Joint.h" #include "Dynamics/ContactJoint.h" -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" #define USE_SOR_SOLVER diff --git a/Extras/quickstep/SorLcp.cpp b/Extras/quickstep/SorLcp.cpp index 0058b6e14..264513637 100644 --- a/Extras/quickstep/SorLcp.cpp +++ b/Extras/quickstep/SorLcp.cpp @@ -28,9 +28,9 @@ // todo: write own successive overrelaxation gauss-seidel, or jacobi iterative solver -#include "SimdScalar.h" +#include "LinearMath/SimdScalar.h" -#include "Dynamics/RigidBody.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" #include #include //FLT_MAX #ifdef WIN32 @@ -50,7 +50,7 @@ #endif #include "Dynamics/BU_Joint.h" -#include "ContactSolverInfo.h" +#include "btContactSolverInfo.h" //////////////////////////////////////////////////////////////////// //math stuff diff --git a/Extras/quickstep/SorLcp.h b/Extras/quickstep/SorLcp.h index 2948fca30..d12fca1f7 100644 --- a/Extras/quickstep/SorLcp.h +++ b/Extras/quickstep/SorLcp.h @@ -27,7 +27,7 @@ #define SOR_LCP_H class RigidBody; class BU_Joint; -#include "SimdScalar.h" +#include "LinearMath/SimdScalar.h" struct ContactSolverInfo; diff --git a/Extras/test_BulletOde.cpp b/Extras/test_BulletOde.cpp index 79b08e6e1..2f970e23a 100644 --- a/Extras/test_BulletOde.cpp +++ b/Extras/test_BulletOde.cpp @@ -29,17 +29,17 @@ #include #include //#include -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionDispatch/CollisionWorld.h" -#include "BroadphaseCollision/SimpleBroadphase.h" -#include "BroadphaseCollision/AxisSweep3.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" +#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" +#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h" -#include "CollisionDispatch/CollisionDispatcher.h" +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/CylinderShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btCylinderShape.h" diff --git a/Jamfile.in b/Jamfile.in index 2cb5fca70..287ed9b56 100644 --- a/Jamfile.in +++ b/Jamfile.in @@ -4,9 +4,7 @@ BUILDTOP ?= "@top_builddir@" ; SubDir TOP ; IncludeDir ; -IncludeDir Bullet ; -IncludeDir BulletDynamics ; -IncludeDir LinearMath ; +IncludeDir src ; IncludeDir $(BUILDTOP) : : literal transient ; @@ -59,9 +57,7 @@ MsvcGenConfig GLUT.LIBDIRS : "../../Glut" ; MsvcGenConfig GLUT.LIBS : glut32.lib ; MsvcGenConfig GLEW.LIBS : glew32.lib ; -SubInclude TOP LinearMath ; -SubInclude TOP Bullet ; -SubInclude TOP BulletDynamics ; +SubInclude TOP src ; SubInclude TOP Extras ; SubInclude TOP Demos ; diff --git a/LinearMath/CMakeLists.txt b/LinearMath/CMakeLists.txt deleted file mode 100644 index 8d0955028..000000000 --- a/LinearMath/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -ADD_LIBRARY(LibLinearMath -Geometry.cpp -Quat.cpp -Vector.cpp -quickprof.cpp -Matrix.cpp -Scalar.cpp -VectorBase.cpp -) - diff --git a/include/Bullet-C-Api.h b/include/Bullet-C-Api.h new file mode 100644 index 000000000..beb504bbf --- /dev/null +++ b/include/Bullet-C-Api.h @@ -0,0 +1,9 @@ + +///This is just a placeholder for now. +/// +///It will contain a C API for high-level Bullet Collision Detection and Physics library. +/// +///for now, only C++ interface is available, see btBulletCollisionCommon.h and btBulletDynamicsCommon.h +/// +///http://bullet.sf.net + diff --git a/lib/readme.txt b/lib/readme.txt new file mode 100644 index 000000000..765f2b817 --- /dev/null +++ b/lib/readme.txt @@ -0,0 +1,13 @@ +At the moment there are no binary packages from Bullet library. +Once this is done, 3 libraries will be placed here: + +bulletmath.a +bulletcollision.a +bulletdynamics.a + +The C-API will be available in the include folder. + +For now, there is only C++ files, see src/btBulletCollisionCommon.h and src/btBulletDynamicsCommon.h + +http://bullet.sf.net +Erwin Coumans diff --git a/msvc/6/appBspDemo.dsp b/msvc/6/appBspDemo.dsp index 163090fc7..590340e56 100644 --- a/msvc/6/appBspDemo.dsp +++ b/msvc/6/appBspDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appCcdPhysicsDemo.dsp b/msvc/6/appCcdPhysicsDemo.dsp index e5f697c21..02f3161da 100644 --- a/msvc/6/appCcdPhysicsDemo.dsp +++ b/msvc/6/appCcdPhysicsDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appColladaDemo.dsp b/msvc/6/appColladaDemo.dsp index 17a7d3463..427f1c711 100644 --- a/msvc/6/appColladaDemo.dsp +++ b/msvc/6/appColladaDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appCollisionDemo.dsp b/msvc/6/appCollisionDemo.dsp index ca338b8c9..12bff0d4f 100644 --- a/msvc/6/appCollisionDemo.dsp +++ b/msvc/6/appCollisionDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appCollisionInterfaceDemo.dsp b/msvc/6/appCollisionInterfaceDemo.dsp index bef72f73f..c55db2cb7 100644 --- a/msvc/6/appCollisionInterfaceDemo.dsp +++ b/msvc/6/appCollisionInterfaceDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appConcaveDemo.dsp b/msvc/6/appConcaveDemo.dsp index 2cb94fa10..4ddc08bcb 100644 --- a/msvc/6/appConcaveDemo.dsp +++ b/msvc/6/appConcaveDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appConstraintDemo.dsp b/msvc/6/appConstraintDemo.dsp index ef1632b4f..e501b7983 100644 --- a/msvc/6/appConstraintDemo.dsp +++ b/msvc/6/appConstraintDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appContinuousConvexCollision.dsp b/msvc/6/appContinuousConvexCollision.dsp index 6f73b3fbf..94f9ce3de 100644 --- a/msvc/6/appContinuousConvexCollision.dsp +++ b/msvc/6/appContinuousConvexCollision.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appConvexDecompositionDemo.dsp b/msvc/6/appConvexDecompositionDemo.dsp index 8ec966838..fe25b3484 100644 --- a/msvc/6/appConvexDecompositionDemo.dsp +++ b/msvc/6/appConvexDecompositionDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appForkLiftDemo.dsp b/msvc/6/appForkLiftDemo.dsp index 2927fb80d..b4d9e6e57 100644 --- a/msvc/6/appForkLiftDemo.dsp +++ b/msvc/6/appForkLiftDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appGjkConvexCastDemo.dsp b/msvc/6/appGjkConvexCastDemo.dsp index e741e5b72..f7d0dc913 100644 --- a/msvc/6/appGjkConvexCastDemo.dsp +++ b/msvc/6/appGjkConvexCastDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appRaytracer.dsp b/msvc/6/appRaytracer.dsp index f37f97530..d4dbf80f2 100644 --- a/msvc/6/appRaytracer.dsp +++ b/msvc/6/appRaytracer.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appSimplexDemo.dsp b/msvc/6/appSimplexDemo.dsp index 401d1b5cc..3c4867451 100644 --- a/msvc/6/appSimplexDemo.dsp +++ b/msvc/6/appSimplexDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appUserCollisionAlgorithm.dsp b/msvc/6/appUserCollisionAlgorithm.dsp index 6f300da62..1ffc07448 100644 --- a/msvc/6/appUserCollisionAlgorithm.dsp +++ b/msvc/6/appUserCollisionAlgorithm.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/appVehicleDemo.dsp b/msvc/6/appVehicleDemo.dsp index a488a7f3d..863e92eb7 100644 --- a/msvc/6/appVehicleDemo.dsp +++ b/msvc/6/appVehicleDemo.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/grpall_bullet.dsp b/msvc/6/grpall_bullet.dsp index 5c1536b01..f035c1f06 100644 --- a/msvc/6/grpall_bullet.dsp +++ b/msvc/6/grpall_bullet.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpall_bullet\grpall_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpall_bullet\grpall_bullet.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpall_bullet\grpall_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpall_bullet\grpall_bullet.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/grpapps_bullet.dsp b/msvc/6/grpapps_bullet.dsp index 351203146..e0fdeaed6 100644 --- a/msvc/6/grpapps_bullet.dsp +++ b/msvc/6/grpapps_bullet.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/grplibs_bullet.dsp b/msvc/6/grplibs_bullet.dsp index 59e8c5a06..37ec5a1b8 100644 --- a/msvc/6/grplibs_bullet.dsp +++ b/msvc/6/grplibs_bullet.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grplibs_bullet\grplibs_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grplibs_bullet\grplibs_bullet.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grplibs_bullet\grplibs_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grplibs_bullet\grplibs_bullet.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libbullet.dsp b/msvc/6/libbullet.dsp deleted file mode 100644 index 8e505dbbf..000000000 --- a/msvc/6/libbullet.dsp +++ /dev/null @@ -1,571 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libbullet" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libbullet - Win32 Release -!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 "libbullet.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 "libbullet.mak" CFG="libbullet - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libbullet - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "libbullet - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libbullet - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "release" -# PROP BASE Intermediate_Dir "release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\out\release6\build\libbullet\" -# PROP Intermediate_Dir "..\..\out\release6\build\libbullet\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbullet\libbullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libbullet.lib" -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 -# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows -# Begin Special Build Tool -SOURCE="$(InputPath)" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libbullet - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "debug" -# PROP BASE Intermediate_Dir "debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\out\debug6\build\libbullet\" -# PROP Intermediate_Dir "..\..\out\debug6\build\libbullet\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbullet\libbullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libbullet_d.lib" -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 -# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows -# Begin Special Build Tool -SOURCE="$(InputPath)" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libbullet - Win32 Release" -# Name "libbullet - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\AxisSweep3.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\BroadphaseProxy.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\Dispatcher.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\OverlappingPairCache.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionDispatcher.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionWorld.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CompoundCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ManifoldResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\SimulationIslandManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\SphereSphereCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\UnionFind.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\BoxShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CollisionShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConeShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexHullShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CylinderShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\EmptyShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\MinkowskiSumShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\MultiSphereShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\OptimizedBvh.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\PolyhedralConvexShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\Simplex1to4Shape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\SphereShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleMesh.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleMeshShape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ConvexCast.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkConvexCast.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkPairDetector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\Hull.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ManifoldContactAddResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\MinkowskiPenetrationDepthSolver.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\PersistentManifold.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\RaycastCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\Shape.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\SubSimplexConvexCast.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\VoronoiSimplexSolver.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\AxisSweep3.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\BroadphaseInterface.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\BroadphaseProxy.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\Dispatcher.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\OverlappingPairCache.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionCreateFunc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionDispatcher.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionObject.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CollisionWorld.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\CompoundCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\ManifoldResult.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\SimulationIslandManager.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\SphereSphereCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionDispatch\UnionFind.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\BoxShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CollisionMargin.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CollisionShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConeShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexHullShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\CylinderShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\EmptyShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\MinkowskiSumShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\MultiSphereShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\OptimizedBvh.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\PolyhedralConvexShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\Simplex1to4Shape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\SphereShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleCallback.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleMesh.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleMeshShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\CollisionShapes\TriangleShape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ConvexCast.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ConvexPenetrationDepthSolver.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\DiscreteCollisionDetectorInterface.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkConvexCast.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkPairDetector.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\Hull.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\HullContactCollector.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ManifoldContactAddResult.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\ManifoldPoint.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\MinkowskiPenetrationDepthSolver.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\PersistentManifold.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\PointCollector.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\RaycastCallback.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\Shape.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\SimplexSolverInterface.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\SubSimplexConvexCast.h -# End Source File -# Begin Source File - -SOURCE=..\..\Bullet\NarrowPhaseCollision\VoronoiSimplexSolver.h -# End Source File -# End Group -# End Target -# End Project diff --git a/msvc/6/libbulletccdphysics.dsp b/msvc/6/libbulletccdphysics.dsp index 8777ca80c..ecd44fe18 100644 --- a/msvc/6/libbulletccdphysics.dsp +++ b/msvc/6/libbulletccdphysics.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletccdphysics\libbulletccdphysics.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletccdphysics\libbulletccdphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletccdphysics\libbulletccdphysics.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletccdphysics\libbulletccdphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp new file mode 100644 index 000000000..48d43accd --- /dev/null +++ b/msvc/6/libbulletcollision.dsp @@ -0,0 +1,547 @@ +# Microsoft Developer Studio Project File - Name="libbulletcollision" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libbulletcollision - Win32 Release +!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 "libbulletcollision.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 "libbulletcollision.mak" CFG="libbulletcollision - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libbulletcollision - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libbulletcollision - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libbulletcollision - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "release" +# PROP BASE Intermediate_Dir "release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\out\release6\build\libbulletcollision\" +# PROP Intermediate_Dir "..\..\out\release6\build\libbulletcollision\" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletcollision\libbulletcollision.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libbulletcollision.lib" +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libbulletcollision - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "debug" +# PROP BASE Intermediate_Dir "debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\out\debug6\build\libbulletcollision\" +# PROP Intermediate_Dir "..\..\out\debug6\build\libbulletcollision\" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletcollision\libbulletcollision.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libbulletcollision_d.lib" +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libbulletcollision - Win32 Release" +# Name "libbulletcollision - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionObject.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionWorld.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btManifoldResult.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btUnionFind.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCollisionShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCompoundShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConcaveShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCylinderShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btEmptyShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btMultiSphereShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btOptimizedBvh.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btSphereShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTetrahedronShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleMesh.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldContactAddResult.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btAxisSweep3.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btBroadphaseInterface.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btBroadphaseProxy.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionObject.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionWorld.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btManifoldResult.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSimulationIslandManager.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btUnionFind.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCollisionMargin.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCollisionShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCompoundShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConcaveShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConeShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btCylinderShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btEmptyShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btMultiSphereShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btOptimizedBvh.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btSphereShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btStaticPlaneShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btStridingMeshInterface.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTetrahedronShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleMesh.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleMeshShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleShape.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btConvexCast.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btConvexPenetrationDepthSolver.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btDiscreteCollisionDetectorInterface.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldContactAddResult.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldPoint.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btPersistentManifold.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btPointCollector.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btRaycastCallback.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btSimplexSolverInterface.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.h +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp index 9ee9094e6..e84d1f73a 100644 --- a/msvc/6/libbulletdynamics.dsp +++ b/msvc/6/libbulletdynamics.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletdynamics\libbulletdynamics.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletdynamics\libbulletdynamics.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletdynamics\libbulletdynamics.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletdynamics\libbulletdynamics.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -104,51 +104,43 @@ SOURCE="$(InputPath)" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\ContactConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\BU_Joint.cpp +SOURCE=..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\ContactJoint.cpp +SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\RigidBody.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\BulletDynamics\Vehicle\RaycastVehicle.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\BulletDynamics\Vehicle\WheelInfo.cpp +SOURCE=..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp # End Source File # End Group # Begin Group "Header Files" @@ -156,71 +148,63 @@ SOURCE=..\..\BulletDynamics\Vehicle\WheelInfo.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\ConstraintSolver.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\ContactConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btContactSolverInfo.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\HingeConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h +SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\BU_Joint.h +SOURCE=..\..\src\BulletDynamics\Dynamics\btMassProps.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\ContactJoint.h +SOURCE=..\..\src\BulletDynamics\Dynamics\btRigidBody.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\MassProps.h +SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Dynamics\RigidBody.h +SOURCE=..\..\src\BulletDynamics\Vehicle\btVehicleRaycaster.h # End Source File # Begin Source File -SOURCE=..\..\BulletDynamics\Vehicle\RaycastVehicle.h -# End Source File -# Begin Source File - -SOURCE=..\..\BulletDynamics\Vehicle\VehicleRaycaster.h -# End Source File -# Begin Source File - -SOURCE=..\..\BulletDynamics\Vehicle\WheelInfo.h +SOURCE=..\..\src\BulletDynamics\Vehicle\btWheelInfo.h # End Source File # End Group # End Target diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp index 336b38566..34e244ea0 100644 --- a/msvc/6/libbulletmath.dsp +++ b/msvc/6/libbulletmath.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -104,31 +104,7 @@ SOURCE="$(InputPath)" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\LinearMath\Geometry.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\Matrix.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\Quat.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\quickprof.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\Scalar.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\Vector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\VectorBase.cpp +SOURCE=..\..\src\LinearMath\GenQuickprof.cpp # End Source File # End Group # Begin Group "Header Files" @@ -136,95 +112,63 @@ SOURCE=..\..\LinearMath\VectorBase.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\LinearMath\AabbUtil2.h +SOURCE=..\..\src\LinearMath\GenAabbUtil2.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\GEN_List.h +SOURCE=..\..\src\LinearMath\GenIDebugDraw.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\GEN_MinMax.h +SOURCE=..\..\src\LinearMath\GenList.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\GEN_random.h +SOURCE=..\..\src\LinearMath\GenMinMax.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Geometry.h +SOURCE=..\..\src\LinearMath\GenQuickprof.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\IDebugDraw.h +SOURCE=..\..\src\LinearMath\GenRandom.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Maths.h +SOURCE=..\..\src\LinearMath\SimdMatrix3x3.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Matrix.h +SOURCE=..\..\src\LinearMath\SimdMinMax.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Memory2.h +SOURCE=..\..\src\LinearMath\SimdPoint3.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Quat.h +SOURCE=..\..\src\LinearMath\SimdQuadWord.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\quickprof.h +SOURCE=..\..\src\LinearMath\SimdQuaternion.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\Scalar.h +SOURCE=..\..\src\LinearMath\SimdScalar.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\SimdMatrix3x3.h +SOURCE=..\..\src\LinearMath\SimdTransform.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\SimdMinMax.h +SOURCE=..\..\src\LinearMath\SimdTransformUtil.h # End Source File # Begin Source File -SOURCE=..\..\LinearMath\SimdPoint3.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdQuadWord.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdQuaternion.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdScalar.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdTransform.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdTransformUtil.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\SimdVector3.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\Vector.h -# End Source File -# Begin Source File - -SOURCE=..\..\LinearMath\VectorBase.h +SOURCE=..\..\src\LinearMath\SimdVector3.h # End Source File # End Group # End Target diff --git a/msvc/6/libbulletopenglsupport.dsp b/msvc/6/libbulletopenglsupport.dsp index 86aaf06d8..69727f6fb 100644 --- a/msvc/6/libbulletopenglsupport.dsp +++ b/msvc/6/libbulletopenglsupport.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libbulletphysicsinterfacecommon.dsp b/msvc/6/libbulletphysicsinterfacecommon.dsp index bc1428bd4..810333864 100644 --- a/msvc/6/libbulletphysicsinterfacecommon.dsp +++ b/msvc/6/libbulletphysicsinterfacecommon.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.res" /i "." /i "..\.." /i "..\..\src" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libcollada-dom.dsp b/msvc/6/libcollada-dom.dsp index 9ecbf5026..e855359d6 100644 --- a/msvc/6/libcollada-dom.dsp +++ b/msvc/6/libcollada-dom.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libconvexdecomposition.dsp b/msvc/6/libconvexdecomposition.dsp index 4d38018ea..bf4c64f9a 100644 --- a/msvc/6/libconvexdecomposition.dsp +++ b/msvc/6/libconvexdecomposition.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/liblibxml.dsp b/msvc/6/liblibxml.dsp index 043fb0a31..395f30ccc 100644 --- a/msvc/6/liblibxml.dsp +++ b/msvc/6/liblibxml.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 543c255e1..ccfd1180a 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -12,10 +12,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -51,10 +51,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -81,10 +81,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -120,10 +120,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -150,10 +150,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -180,10 +180,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -210,10 +210,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -240,10 +240,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -270,10 +270,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -309,10 +309,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -339,10 +339,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -360,18 +360,6 @@ Package=<4> ############################################################################### -Project: "appGPUphysics"=.\appGPUphysics.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "appRaytracer"=.\appRaytracer.dsp - Package Owner=<4> Package=<5> @@ -381,10 +369,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -411,10 +399,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -441,10 +429,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -471,10 +459,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -534,9 +522,6 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appGPUphysics - End Project Dependency - Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency @@ -549,10 +534,10 @@ Package=<4> Project_Dep_Name appVehicleDemo End Project Dependency Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -621,9 +606,6 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appGPUphysics - End Project Dependency - Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency @@ -648,10 +630,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libbullet + Project_Dep_Name libbulletccdphysics End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletccdphysics + Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency Project_Dep_Name libbulletdynamics @@ -678,7 +660,7 @@ Package=<4> ############################################################################### -Project: "libbullet"=.\libbullet.dsp - Package Owner=<4> +Project: "libbulletccdphysics"=.\libbulletccdphysics.dsp - Package Owner=<4> Package=<5> {{{ @@ -690,7 +672,7 @@ Package=<4> ############################################################################### -Project: "libbulletccdphysics"=.\libbulletccdphysics.dsp - Package Owner=<4> +Project: "libbulletcollision"=.\libbulletcollision.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/msvc/7/appBspDemo.vcproj b/msvc/7/appBspDemo.vcproj index cd2d19930..9349217c4 100644 --- a/msvc/7/appBspDemo.vcproj +++ b/msvc/7/appBspDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release7\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appBspDemo\" ObjectFile="..\..\out\release7\build\appBspDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug7\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appBspDemo\" ObjectFile="..\..\out\debug7\build\appBspDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appCcdPhysicsDemo.vcproj b/msvc/7/appCcdPhysicsDemo.vcproj index f564257be..a5966ac49 100644 --- a/msvc/7/appCcdPhysicsDemo.vcproj +++ b/msvc/7/appCcdPhysicsDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\release7\build\appCcdPhysicsDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\debug7\build\appCcdPhysicsDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appColladaDemo.vcproj b/msvc/7/appColladaDemo.vcproj index 1ca22477f..da2ef0efe 100644 --- a/msvc/7/appColladaDemo.vcproj +++ b/msvc/7/appColladaDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\release7\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appColladaDemo\" ObjectFile="..\..\out\release7\build\appColladaDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\debug7\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appColladaDemo\" ObjectFile="..\..\out\debug7\build\appColladaDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appCollisionDemo.vcproj b/msvc/7/appCollisionDemo.vcproj index 2f089ddf5..86989b578 100644 --- a/msvc/7/appCollisionDemo.vcproj +++ b/msvc/7/appCollisionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appCollisionDemo\" ObjectFile="..\..\out\release7\build\appCollisionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appCollisionDemo\" ObjectFile="..\..\out\debug7\build\appCollisionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appCollisionInterfaceDemo.vcproj b/msvc/7/appCollisionInterfaceDemo.vcproj index 76079d1c3..163d546f3 100644 --- a/msvc/7/appCollisionInterfaceDemo.vcproj +++ b/msvc/7/appCollisionInterfaceDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\release7\build\appCollisionInterfaceDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\debug7\build\appCollisionInterfaceDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appConcaveDemo.vcproj b/msvc/7/appConcaveDemo.vcproj index e5d58fe45..12f376e2d 100644 --- a/msvc/7/appConcaveDemo.vcproj +++ b/msvc/7/appConcaveDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appConcaveDemo\" ObjectFile="..\..\out\release7\build\appConcaveDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appConcaveDemo\" ObjectFile="..\..\out\debug7\build\appConcaveDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appConstraintDemo.vcproj b/msvc/7/appConstraintDemo.vcproj index 35e0a1172..05d9e996f 100644 --- a/msvc/7/appConstraintDemo.vcproj +++ b/msvc/7/appConstraintDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appConstraintDemo\" ObjectFile="..\..\out\release7\build\appConstraintDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appConstraintDemo\" ObjectFile="..\..\out\debug7\build\appConstraintDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appContinuousConvexCollision.vcproj b/msvc/7/appContinuousConvexCollision.vcproj index 8842ba1bd..3b347e6d3 100644 --- a/msvc/7/appContinuousConvexCollision.vcproj +++ b/msvc/7/appContinuousConvexCollision.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\release7\build\appContinuousConvexCollision\" ObjectFile="..\..\out\release7\build\appContinuousConvexCollision\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\debug7\build\appContinuousConvexCollision\" ObjectFile="..\..\out\debug7\build\appContinuousConvexCollision\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appConvexDecompositionDemo.vcproj b/msvc/7/appConvexDecompositionDemo.vcproj index 1bc41f7cd..3ec461b7b 100644 --- a/msvc/7/appConvexDecompositionDemo.vcproj +++ b/msvc/7/appConvexDecompositionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release7\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\release7\build\appConvexDecompositionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug7\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\debug7\build\appConvexDecompositionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appForkLiftDemo.vcproj b/msvc/7/appForkLiftDemo.vcproj index b0628ecec..01d5100ad 100644 --- a/msvc/7/appForkLiftDemo.vcproj +++ b/msvc/7/appForkLiftDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appForkLiftDemo\" ObjectFile="..\..\out\release7\build\appForkLiftDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appForkLiftDemo\" ObjectFile="..\..\out\debug7\build\appForkLiftDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appGjkConvexCastDemo.vcproj b/msvc/7/appGjkConvexCastDemo.vcproj index 941110de8..81f30e5d7 100644 --- a/msvc/7/appGjkConvexCastDemo.vcproj +++ b/msvc/7/appGjkConvexCastDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\release7\build\appGjkConvexCastDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\debug7\build\appGjkConvexCastDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appRaytracer.vcproj b/msvc/7/appRaytracer.vcproj index 3299968de..323f0507d 100644 --- a/msvc/7/appRaytracer.vcproj +++ b/msvc/7/appRaytracer.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\release7\build\appRaytracer\" ObjectFile="..\..\out\release7\build\appRaytracer\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\debug7\build\appRaytracer\" ObjectFile="..\..\out\debug7\build\appRaytracer\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appSimplexDemo.vcproj b/msvc/7/appSimplexDemo.vcproj index f382f5c57..1f52367cf 100644 --- a/msvc/7/appSimplexDemo.vcproj +++ b/msvc/7/appSimplexDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appSimplexDemo\" ObjectFile="..\..\out\release7\build\appSimplexDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appSimplexDemo\" ObjectFile="..\..\out\debug7\build\appSimplexDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appUserCollisionAlgorithm.vcproj b/msvc/7/appUserCollisionAlgorithm.vcproj index ec66bb8f4..ec9e50b17 100644 --- a/msvc/7/appUserCollisionAlgorithm.vcproj +++ b/msvc/7/appUserCollisionAlgorithm.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\release7\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\release7\build\appUserCollisionAlgorithm\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\debug7\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\debug7\build\appUserCollisionAlgorithm\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/appVehicleDemo.vcproj b/msvc/7/appVehicleDemo.vcproj index ecf0466e6..f6a7c598d 100644 --- a/msvc/7/appVehicleDemo.vcproj +++ b/msvc/7/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appVehicleDemo\" ObjectFile="..\..\out\release7\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appVehicleDemo\" ObjectFile="..\..\out\debug7\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/grpall_bullet.vcproj b/msvc/7/grpall_bullet.vcproj index b433fa4c4..408f47031 100644 --- a/msvc/7/grpall_bullet.vcproj +++ b/msvc/7/grpall_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release7\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\release7\build\grpall_bullet\" ObjectFile="..\..\out\release7\build\grpall_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug7\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\debug7\build\grpall_bullet\" ObjectFile="..\..\out\debug7\build\grpall_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/grpapps_bullet.vcproj b/msvc/7/grpapps_bullet.vcproj index 5ea5fd551..3ebfeeda4 100644 --- a/msvc/7/grpapps_bullet.vcproj +++ b/msvc/7/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release7\build\grpapps_bullet\" ObjectFile="..\..\out\release7\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug7\build\grpapps_bullet\" ObjectFile="..\..\out\debug7\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/grplibs_bullet.vcproj b/msvc/7/grplibs_bullet.vcproj index f34b54a86..700819d4a 100644 --- a/msvc/7/grplibs_bullet.vcproj +++ b/msvc/7/grplibs_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release7\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\release7\build\grplibs_bullet\" ObjectFile="..\..\out\release7\build\grplibs_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug7\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\debug7\build\grplibs_bullet\" ObjectFile="..\..\out\debug7\build\grplibs_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libbullet.vcproj b/msvc/7/libbullet.vcproj deleted file mode 100644 index 55326274d..000000000 --- a/msvc/7/libbullet.vcproj +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/7/libbulletccdphysics.vcproj b/msvc/7/libbulletccdphysics.vcproj index bd34c24f9..3270ad213 100644 --- a/msvc/7/libbulletccdphysics.vcproj +++ b/msvc/7/libbulletccdphysics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\release7\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletccdphysics\" ObjectFile="..\..\out\release7\build\libbulletccdphysics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletccdphysics\" ObjectFile="..\..\out\debug7\build\libbulletccdphysics\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj new file mode 100644 index 000000000..934df477b --- /dev/null +++ b/msvc/7/libbulletcollision.vcproj @@ -0,0 +1,499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj index 6dfbbda04..cbefad948 100644 --- a/msvc/7/libbulletdynamics.vcproj +++ b/msvc/7/libbulletdynamics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release7\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletdynamics\" ObjectFile="..\..\out\release7\build\libbulletdynamics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletdynamics\" ObjectFile="..\..\out\debug7\build\libbulletdynamics\" @@ -149,7 +149,7 @@ @@ -162,95 +162,83 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactSolverInfo.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btVehicleRaycaster.h"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.h"> diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj index c40dff51e..a50e14838 100644 --- a/msvc/7/libbulletmath.vcproj +++ b/msvc/7/libbulletmath.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release7\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletmath\" ObjectFile="..\..\out\release7\build\libbulletmath\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletmath\" ObjectFile="..\..\out\debug7\build\libbulletmath\" @@ -149,7 +149,7 @@ @@ -162,98 +162,56 @@ Name="Source Files" Filter=""> - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\GenQuickprof.cpp"> + RelativePath="..\..\src\LinearMath\GenAabbUtil2.h"> + RelativePath="..\..\src\LinearMath\GenIDebugDraw.h"> + RelativePath="..\..\src\LinearMath\GenList.h"> + RelativePath="..\..\src\LinearMath\GenMinMax.h"> + RelativePath="..\..\src\LinearMath\GenQuickprof.h"> + RelativePath="..\..\src\LinearMath\GenRandom.h"> + RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h"> + RelativePath="..\..\src\LinearMath\SimdMinMax.h"> + RelativePath="..\..\src\LinearMath\SimdPoint3.h"> + RelativePath="..\..\src\LinearMath\SimdQuadWord.h"> + RelativePath="..\..\src\LinearMath\SimdQuaternion.h"> + RelativePath="..\..\src\LinearMath\SimdScalar.h"> + RelativePath="..\..\src\LinearMath\SimdTransform.h"> + RelativePath="..\..\src\LinearMath\SimdTransformUtil.h"> - - - - - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\SimdVector3.h"> diff --git a/msvc/7/libbulletopenglsupport.vcproj b/msvc/7/libbulletopenglsupport.vcproj index 5c46b395c..cfc81814f 100644 --- a/msvc/7/libbulletopenglsupport.vcproj +++ b/msvc/7/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\release7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletopenglsupport\" ObjectFile="..\..\out\release7\build\libbulletopenglsupport\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug7\build\libbulletopenglsupport\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libbulletphysicsinterfacecommon.vcproj b/msvc/7/libbulletphysicsinterfacecommon.vcproj index 1f53a0687..db56f8fd5 100644 --- a/msvc/7/libbulletphysicsinterfacecommon.vcproj +++ b/msvc/7/libbulletphysicsinterfacecommon.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release7\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\release7\build\libbulletphysicsinterfacecommon\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\debug7\build\libbulletphysicsinterfacecommon\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libcollada-dom.vcproj b/msvc/7/libcollada-dom.vcproj index a382eb0ae..ea6a375bf 100644 --- a/msvc/7/libcollada-dom.vcproj +++ b/msvc/7/libcollada-dom.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release7\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\release7\build\libcollada-dom\" ObjectFile="..\..\out\release7\build\libcollada-dom\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug7\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\debug7\build\libcollada-dom\" ObjectFile="..\..\out\debug7\build\libcollada-dom\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libconvexdecomposition.vcproj b/msvc/7/libconvexdecomposition.vcproj index a10a2b8f5..8b08c14bf 100644 --- a/msvc/7/libconvexdecomposition.vcproj +++ b/msvc/7/libconvexdecomposition.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\release7\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\release7\build\libconvexdecomposition\" ObjectFile="..\..\out\release7\build\libconvexdecomposition\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\debug7\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\debug7\build\libconvexdecomposition\" ObjectFile="..\..\out\debug7\build\libconvexdecomposition\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/liblibxml.vcproj b/msvc/7/liblibxml.vcproj index 1697eb491..77e2b1fa3 100644 --- a/msvc/7/liblibxml.vcproj +++ b/msvc/7/liblibxml.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release7\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\release7\build\liblibxml\" ObjectFile="..\..\out\release7\build\liblibxml\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug7\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\debug7\build\liblibxml\" ObjectFile="..\..\out\debug7\build\liblibxml\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 3666c0221..895bb61d7 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkL EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -38,10 +36,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "libbullet.vcproj", "{90F5975E-550B-EEC8-9A8A-B8581D3FCF97}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" @@ -62,8 +60,8 @@ Global ConfigName.1 = Debug EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -71,14 +69,14 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -86,38 +84,38 @@ Global {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -125,38 +123,38 @@ Global {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {330B5049-6935-5CE6-79B7-28F570962895}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {330B5049-6935-5CE6-79B7-28F570962895}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -172,20 +170,19 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -197,13 +194,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -257,10 +253,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 @@ -289,14 +281,14 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.ActiveCfg = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.Build.0 = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.ActiveCfg = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.Build.0 = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/71/appBspDemo.vcproj b/msvc/71/appBspDemo.vcproj index 644e33f6b..00646dac4 100644 --- a/msvc/71/appBspDemo.vcproj +++ b/msvc/71/appBspDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release71\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appBspDemo\" ObjectFile="..\..\out\release71\build\appBspDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug71\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appBspDemo\" ObjectFile="..\..\out\debug71\build\appBspDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appCcdPhysicsDemo.vcproj b/msvc/71/appCcdPhysicsDemo.vcproj index 1fb30d26f..4f40da2fa 100644 --- a/msvc/71/appCcdPhysicsDemo.vcproj +++ b/msvc/71/appCcdPhysicsDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\release71\build\appCcdPhysicsDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\debug71\build\appCcdPhysicsDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appColladaDemo.vcproj b/msvc/71/appColladaDemo.vcproj index 38698d91f..08b843eba 100644 --- a/msvc/71/appColladaDemo.vcproj +++ b/msvc/71/appColladaDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\release71\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appColladaDemo\" ObjectFile="..\..\out\release71\build\appColladaDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\debug71\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appColladaDemo\" ObjectFile="..\..\out\debug71\build\appColladaDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appCollisionDemo.vcproj b/msvc/71/appCollisionDemo.vcproj index 42a081a46..7939f0efe 100644 --- a/msvc/71/appCollisionDemo.vcproj +++ b/msvc/71/appCollisionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appCollisionDemo\" ObjectFile="..\..\out\release71\build\appCollisionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appCollisionDemo\" ObjectFile="..\..\out\debug71\build\appCollisionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appCollisionInterfaceDemo.vcproj b/msvc/71/appCollisionInterfaceDemo.vcproj index 502cc31b4..194606955 100644 --- a/msvc/71/appCollisionInterfaceDemo.vcproj +++ b/msvc/71/appCollisionInterfaceDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\release71\build\appCollisionInterfaceDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\debug71\build\appCollisionInterfaceDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appConcaveDemo.vcproj b/msvc/71/appConcaveDemo.vcproj index 6349e09cb..5d6b2ff60 100644 --- a/msvc/71/appConcaveDemo.vcproj +++ b/msvc/71/appConcaveDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appConcaveDemo\" ObjectFile="..\..\out\release71\build\appConcaveDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appConcaveDemo\" ObjectFile="..\..\out\debug71\build\appConcaveDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appConstraintDemo.vcproj b/msvc/71/appConstraintDemo.vcproj index 4489ec2c5..14f798096 100644 --- a/msvc/71/appConstraintDemo.vcproj +++ b/msvc/71/appConstraintDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appConstraintDemo\" ObjectFile="..\..\out\release71\build\appConstraintDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appConstraintDemo\" ObjectFile="..\..\out\debug71\build\appConstraintDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appContinuousConvexCollision.vcproj b/msvc/71/appContinuousConvexCollision.vcproj index bf082beda..2b8891a44 100644 --- a/msvc/71/appContinuousConvexCollision.vcproj +++ b/msvc/71/appContinuousConvexCollision.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\release71\build\appContinuousConvexCollision\" ObjectFile="..\..\out\release71\build\appContinuousConvexCollision\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\debug71\build\appContinuousConvexCollision\" ObjectFile="..\..\out\debug71\build\appContinuousConvexCollision\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appConvexDecompositionDemo.vcproj b/msvc/71/appConvexDecompositionDemo.vcproj index 1052e82c9..510a9ac5a 100644 --- a/msvc/71/appConvexDecompositionDemo.vcproj +++ b/msvc/71/appConvexDecompositionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release71\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\release71\build\appConvexDecompositionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug71\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\debug71\build\appConvexDecompositionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appForkLiftDemo.vcproj b/msvc/71/appForkLiftDemo.vcproj index a1d648cbc..814a061e2 100644 --- a/msvc/71/appForkLiftDemo.vcproj +++ b/msvc/71/appForkLiftDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appForkLiftDemo\" ObjectFile="..\..\out\release71\build\appForkLiftDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appForkLiftDemo\" ObjectFile="..\..\out\debug71\build\appForkLiftDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appGjkConvexCastDemo.vcproj b/msvc/71/appGjkConvexCastDemo.vcproj index 5db17d678..a5d89c458 100644 --- a/msvc/71/appGjkConvexCastDemo.vcproj +++ b/msvc/71/appGjkConvexCastDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\release71\build\appGjkConvexCastDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\debug71\build\appGjkConvexCastDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appRaytracer.vcproj b/msvc/71/appRaytracer.vcproj index d5200d421..4ee30988f 100644 --- a/msvc/71/appRaytracer.vcproj +++ b/msvc/71/appRaytracer.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\release71\build\appRaytracer\" ObjectFile="..\..\out\release71\build\appRaytracer\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\debug71\build\appRaytracer\" ObjectFile="..\..\out\debug71\build\appRaytracer\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appSimplexDemo.vcproj b/msvc/71/appSimplexDemo.vcproj index 1944d6559..b67bb66ed 100644 --- a/msvc/71/appSimplexDemo.vcproj +++ b/msvc/71/appSimplexDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appSimplexDemo\" ObjectFile="..\..\out\release71\build\appSimplexDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appSimplexDemo\" ObjectFile="..\..\out\debug71\build\appSimplexDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appUserCollisionAlgorithm.vcproj b/msvc/71/appUserCollisionAlgorithm.vcproj index 8623667c5..e84193b0d 100644 --- a/msvc/71/appUserCollisionAlgorithm.vcproj +++ b/msvc/71/appUserCollisionAlgorithm.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\release71\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\release71\build\appUserCollisionAlgorithm\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\debug71\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\debug71\build\appUserCollisionAlgorithm\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/appVehicleDemo.vcproj b/msvc/71/appVehicleDemo.vcproj index 167a567e6..34ba67ad5 100644 --- a/msvc/71/appVehicleDemo.vcproj +++ b/msvc/71/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appVehicleDemo\" ObjectFile="..\..\out\release71\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appVehicleDemo\" ObjectFile="..\..\out\debug71\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/grpall_bullet.vcproj b/msvc/71/grpall_bullet.vcproj index 23eb9856c..f39cdc6d4 100644 --- a/msvc/71/grpall_bullet.vcproj +++ b/msvc/71/grpall_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release71\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\release71\build\grpall_bullet\" ObjectFile="..\..\out\release71\build\grpall_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug71\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\debug71\build\grpall_bullet\" ObjectFile="..\..\out\debug71\build\grpall_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/grpapps_bullet.vcproj b/msvc/71/grpapps_bullet.vcproj index d2601f649..4e37059b4 100644 --- a/msvc/71/grpapps_bullet.vcproj +++ b/msvc/71/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release71\build\grpapps_bullet\" ObjectFile="..\..\out\release71\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug71\build\grpapps_bullet\" ObjectFile="..\..\out\debug71\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/grplibs_bullet.vcproj b/msvc/71/grplibs_bullet.vcproj index f1f40231f..8f5afd765 100644 --- a/msvc/71/grplibs_bullet.vcproj +++ b/msvc/71/grplibs_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release71\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\release71\build\grplibs_bullet\" ObjectFile="..\..\out\release71\build\grplibs_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug71\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\debug71\build\grplibs_bullet\" ObjectFile="..\..\out\debug71\build\grplibs_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libbullet.vcproj b/msvc/71/libbullet.vcproj deleted file mode 100644 index d280e2274..000000000 --- a/msvc/71/libbullet.vcproj +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/71/libbulletccdphysics.vcproj b/msvc/71/libbulletccdphysics.vcproj index 3cc837185..cbf51ee86 100644 --- a/msvc/71/libbulletccdphysics.vcproj +++ b/msvc/71/libbulletccdphysics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\release71\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletccdphysics\" ObjectFile="..\..\out\release71\build\libbulletccdphysics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletccdphysics\" ObjectFile="..\..\out\debug71\build\libbulletccdphysics\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj new file mode 100644 index 000000000..f8f311ea9 --- /dev/null +++ b/msvc/71/libbulletcollision.vcproj @@ -0,0 +1,499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj index cca20cfe5..e959d2f3c 100644 --- a/msvc/71/libbulletdynamics.vcproj +++ b/msvc/71/libbulletdynamics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release71\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletdynamics\" ObjectFile="..\..\out\release71\build\libbulletdynamics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletdynamics\" ObjectFile="..\..\out\debug71\build\libbulletdynamics\" @@ -149,7 +149,7 @@ @@ -162,95 +162,83 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactSolverInfo.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btVehicleRaycaster.h"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.h"> diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj index e9d275602..f27dfb0f8 100644 --- a/msvc/71/libbulletmath.vcproj +++ b/msvc/71/libbulletmath.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release71\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletmath\" ObjectFile="..\..\out\release71\build\libbulletmath\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletmath\" ObjectFile="..\..\out\debug71\build\libbulletmath\" @@ -149,7 +149,7 @@ @@ -162,98 +162,56 @@ Name="Source Files" Filter=""> - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\GenQuickprof.cpp"> + RelativePath="..\..\src\LinearMath\GenAabbUtil2.h"> + RelativePath="..\..\src\LinearMath\GenIDebugDraw.h"> + RelativePath="..\..\src\LinearMath\GenList.h"> + RelativePath="..\..\src\LinearMath\GenMinMax.h"> + RelativePath="..\..\src\LinearMath\GenQuickprof.h"> + RelativePath="..\..\src\LinearMath\GenRandom.h"> + RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h"> + RelativePath="..\..\src\LinearMath\SimdMinMax.h"> + RelativePath="..\..\src\LinearMath\SimdPoint3.h"> + RelativePath="..\..\src\LinearMath\SimdQuadWord.h"> + RelativePath="..\..\src\LinearMath\SimdQuaternion.h"> + RelativePath="..\..\src\LinearMath\SimdScalar.h"> + RelativePath="..\..\src\LinearMath\SimdTransform.h"> + RelativePath="..\..\src\LinearMath\SimdTransformUtil.h"> - - - - - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\SimdVector3.h"> diff --git a/msvc/71/libbulletopenglsupport.vcproj b/msvc/71/libbulletopenglsupport.vcproj index eca448882..e2e6c3b0a 100644 --- a/msvc/71/libbulletopenglsupport.vcproj +++ b/msvc/71/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\release71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletopenglsupport\" ObjectFile="..\..\out\release71\build\libbulletopenglsupport\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug71\build\libbulletopenglsupport\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libbulletphysicsinterfacecommon.vcproj b/msvc/71/libbulletphysicsinterfacecommon.vcproj index 8d45988d7..41179c793 100644 --- a/msvc/71/libbulletphysicsinterfacecommon.vcproj +++ b/msvc/71/libbulletphysicsinterfacecommon.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release71\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\release71\build\libbulletphysicsinterfacecommon\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\debug71\build\libbulletphysicsinterfacecommon\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libcollada-dom.vcproj b/msvc/71/libcollada-dom.vcproj index 8a348bfef..c99992d02 100644 --- a/msvc/71/libcollada-dom.vcproj +++ b/msvc/71/libcollada-dom.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release71\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\release71\build\libcollada-dom\" ObjectFile="..\..\out\release71\build\libcollada-dom\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug71\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\debug71\build\libcollada-dom\" ObjectFile="..\..\out\debug71\build\libcollada-dom\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libconvexdecomposition.vcproj b/msvc/71/libconvexdecomposition.vcproj index 692f7f31c..22e948b85 100644 --- a/msvc/71/libconvexdecomposition.vcproj +++ b/msvc/71/libconvexdecomposition.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\release71\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\release71\build\libconvexdecomposition\" ObjectFile="..\..\out\release71\build\libconvexdecomposition\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\debug71\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\debug71\build\libconvexdecomposition\" ObjectFile="..\..\out\debug71\build\libconvexdecomposition\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/liblibxml.vcproj b/msvc/71/liblibxml.vcproj index 24ba6e0c9..2de3e980f 100644 --- a/msvc/71/liblibxml.vcproj +++ b/msvc/71/liblibxml.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release71\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\release71\build\liblibxml\" ObjectFile="..\..\out\release71\build\liblibxml\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug71\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\debug71\build\liblibxml\" ObjectFile="..\..\out\debug71\build\liblibxml\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 694953dce..fc9b2c848 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkL EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -38,10 +36,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "libbullet.vcproj", "{90F5975E-550B-EEC8-9A8A-B8581D3FCF97}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" @@ -62,8 +60,8 @@ Global ConfigName.1 = Debug EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -71,14 +69,14 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -86,38 +84,38 @@ Global {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -125,38 +123,38 @@ Global {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {330B5049-6935-5CE6-79B7-28F570962895}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {330B5049-6935-5CE6-79B7-28F570962895}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -172,20 +170,19 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -197,13 +194,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -257,10 +253,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 @@ -289,14 +281,14 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.ActiveCfg = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.Build.0 = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.ActiveCfg = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.Build.0 = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/8/appBspDemo.vcproj b/msvc/8/appBspDemo.vcproj index 80297a76b..ec3dbc595 100644 --- a/msvc/8/appBspDemo.vcproj +++ b/msvc/8/appBspDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release8\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appBspDemo\" ObjectFile="..\..\out\release8\build\appBspDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug8\build\appBspDemo\appBspDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appBspDemo\" ObjectFile="..\..\out\debug8\build\appBspDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appCcdPhysicsDemo.vcproj b/msvc/8/appCcdPhysicsDemo.vcproj index b34180aa4..6d72817b4 100644 --- a/msvc/8/appCcdPhysicsDemo.vcproj +++ b/msvc/8/appCcdPhysicsDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\release8\build\appCcdPhysicsDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appCcdPhysicsDemo\" ObjectFile="..\..\out\debug8\build\appCcdPhysicsDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appColladaDemo.vcproj b/msvc/8/appColladaDemo.vcproj index 007e3172d..3a5775a88 100644 --- a/msvc/8/appColladaDemo.vcproj +++ b/msvc/8/appColladaDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\release8\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appColladaDemo\" ObjectFile="..\..\out\release8\build\appColladaDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada" PrecompiledHeaderFile="..\..\out\debug8\build\appColladaDemo\appColladaDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appColladaDemo\" ObjectFile="..\..\out\debug8\build\appColladaDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appCollisionDemo.vcproj b/msvc/8/appCollisionDemo.vcproj index 6f911841c..da4319603 100644 --- a/msvc/8/appCollisionDemo.vcproj +++ b/msvc/8/appCollisionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appCollisionDemo\" ObjectFile="..\..\out\release8\build\appCollisionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionDemo\appCollisionDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appCollisionDemo\" ObjectFile="..\..\out\debug8\build\appCollisionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appCollisionInterfaceDemo.vcproj b/msvc/8/appCollisionInterfaceDemo.vcproj index 45a8791dd..153721453 100644 --- a/msvc/8/appCollisionInterfaceDemo.vcproj +++ b/msvc/8/appCollisionInterfaceDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\release8\build\appCollisionInterfaceDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appCollisionInterfaceDemo\" ObjectFile="..\..\out\debug8\build\appCollisionInterfaceDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appConcaveDemo.vcproj b/msvc/8/appConcaveDemo.vcproj index 83f935643..df10cb9e8 100644 --- a/msvc/8/appConcaveDemo.vcproj +++ b/msvc/8/appConcaveDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appConcaveDemo\" ObjectFile="..\..\out\release8\build\appConcaveDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appConcaveDemo\appConcaveDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appConcaveDemo\" ObjectFile="..\..\out\debug8\build\appConcaveDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appConstraintDemo.vcproj b/msvc/8/appConstraintDemo.vcproj index edc28f161..4f19b2c65 100644 --- a/msvc/8/appConstraintDemo.vcproj +++ b/msvc/8/appConstraintDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appConstraintDemo\" ObjectFile="..\..\out\release8\build\appConstraintDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appConstraintDemo\appConstraintDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appConstraintDemo\" ObjectFile="..\..\out\debug8\build\appConstraintDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appContinuousConvexCollision.vcproj b/msvc/8/appContinuousConvexCollision.vcproj index 24c859338..3bdb9c239 100644 --- a/msvc/8/appContinuousConvexCollision.vcproj +++ b/msvc/8/appContinuousConvexCollision.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\release8\build\appContinuousConvexCollision\" ObjectFile="..\..\out\release8\build\appContinuousConvexCollision\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch" AssemblerListingLocation="..\..\out\debug8\build\appContinuousConvexCollision\" ObjectFile="..\..\out\debug8\build\appContinuousConvexCollision\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appConvexDecompositionDemo.vcproj b/msvc/8/appConvexDecompositionDemo.vcproj index 5f0f6f12a..1d531cc03 100644 --- a/msvc/8/appConvexDecompositionDemo.vcproj +++ b/msvc/8/appConvexDecompositionDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\release8\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\release8\build\appConvexDecompositionDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML" PrecompiledHeaderFile="..\..\out\debug8\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appConvexDecompositionDemo\" ObjectFile="..\..\out\debug8\build\appConvexDecompositionDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appForkLiftDemo.vcproj b/msvc/8/appForkLiftDemo.vcproj index d89db6a48..dfc740e60 100644 --- a/msvc/8/appForkLiftDemo.vcproj +++ b/msvc/8/appForkLiftDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appForkLiftDemo\" ObjectFile="..\..\out\release8\build\appForkLiftDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appForkLiftDemo\appForkLiftDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appForkLiftDemo\" ObjectFile="..\..\out\debug8\build\appForkLiftDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appGjkConvexCastDemo.vcproj b/msvc/8/appGjkConvexCastDemo.vcproj index 3791fef1f..fa12bc45a 100644 --- a/msvc/8/appGjkConvexCastDemo.vcproj +++ b/msvc/8/appGjkConvexCastDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\release8\build\appGjkConvexCastDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appGjkConvexCastDemo\" ObjectFile="..\..\out\debug8\build\appGjkConvexCastDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appRaytracer.vcproj b/msvc/8/appRaytracer.vcproj index 04358fc4f..a9de34e1f 100644 --- a/msvc/8/appRaytracer.vcproj +++ b/msvc/8/appRaytracer.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\release8\build\appRaytracer\" ObjectFile="..\..\out\release8\build\appRaytracer\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appRaytracer\appRaytracer.pch" AssemblerListingLocation="..\..\out\debug8\build\appRaytracer\" ObjectFile="..\..\out\debug8\build\appRaytracer\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appSimplexDemo.vcproj b/msvc/8/appSimplexDemo.vcproj index b66fe2b55..d7ff34f89 100644 --- a/msvc/8/appSimplexDemo.vcproj +++ b/msvc/8/appSimplexDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appSimplexDemo\" ObjectFile="..\..\out\release8\build\appSimplexDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appSimplexDemo\appSimplexDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appSimplexDemo\" ObjectFile="..\..\out\debug8\build\appSimplexDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appUserCollisionAlgorithm.vcproj b/msvc/8/appUserCollisionAlgorithm.vcproj index 08d4fe9e5..653235d77 100644 --- a/msvc/8/appUserCollisionAlgorithm.vcproj +++ b/msvc/8/appUserCollisionAlgorithm.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\release8\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\release8\build\appUserCollisionAlgorithm\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch" AssemblerListingLocation="..\..\out\debug8\build\appUserCollisionAlgorithm\" ObjectFile="..\..\out\debug8\build\appUserCollisionAlgorithm\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/appVehicleDemo.vcproj b/msvc/8/appVehicleDemo.vcproj index 4eea805d6..254631838 100644 --- a/msvc/8/appVehicleDemo.vcproj +++ b/msvc/8/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appVehicleDemo\" ObjectFile="..\..\out\release8\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appVehicleDemo\" ObjectFile="..\..\out\debug8\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/grpall_bullet.vcproj b/msvc/8/grpall_bullet.vcproj index 3b6014133..c8782d85e 100644 --- a/msvc/8/grpall_bullet.vcproj +++ b/msvc/8/grpall_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release8\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\release8\build\grpall_bullet\" ObjectFile="..\..\out\release8\build\grpall_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug8\build\grpall_bullet\grpall_bullet.pch" AssemblerListingLocation="..\..\out\debug8\build\grpall_bullet\" ObjectFile="..\..\out\debug8\build\grpall_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/grpapps_bullet.vcproj b/msvc/8/grpapps_bullet.vcproj index af6ce59c8..e2e7722b6 100644 --- a/msvc/8/grpapps_bullet.vcproj +++ b/msvc/8/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\" ObjectFile="..\..\out\release8\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\" ObjectFile="..\..\out\debug8\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/grplibs_bullet.vcproj b/msvc/8/grplibs_bullet.vcproj index 4ddcaa8d7..9ac3f2ff8 100644 --- a/msvc/8/grplibs_bullet.vcproj +++ b/msvc/8/grplibs_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release8\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\release8\build\grplibs_bullet\" ObjectFile="..\..\out\release8\build\grplibs_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug8\build\grplibs_bullet\grplibs_bullet.pch" AssemblerListingLocation="..\..\out\debug8\build\grplibs_bullet\" ObjectFile="..\..\out\debug8\build\grplibs_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libbullet.vcproj b/msvc/8/libbullet.vcproj deleted file mode 100644 index 4325cc4ce..000000000 --- a/msvc/8/libbullet.vcproj +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/8/libbulletccdphysics.vcproj b/msvc/8/libbulletccdphysics.vcproj index 4c1f1417a..25af6bf49 100644 --- a/msvc/8/libbulletccdphysics.vcproj +++ b/msvc/8/libbulletccdphysics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\release8\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletccdphysics\" ObjectFile="..\..\out\release8\build\libbulletccdphysics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletccdphysics\libbulletccdphysics.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletccdphysics\" ObjectFile="..\..\out\debug8\build\libbulletccdphysics\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj new file mode 100644 index 000000000..243200a7d --- /dev/null +++ b/msvc/8/libbulletcollision.vcproj @@ -0,0 +1,499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj index 5627c7f6a..f5c0f31c8 100644 --- a/msvc/8/libbulletdynamics.vcproj +++ b/msvc/8/libbulletdynamics.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release8\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletdynamics\" ObjectFile="..\..\out\release8\build\libbulletdynamics\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletdynamics\libbulletdynamics.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletdynamics\" ObjectFile="..\..\out\debug8\build\libbulletdynamics\" @@ -149,7 +149,7 @@ @@ -162,95 +162,83 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btContactSolverInfo.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.h"> + RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h"> + RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h"> + RelativePath="..\..\src\BulletDynamics\Vehicle\btVehicleRaycaster.h"> - - - - + RelativePath="..\..\src\BulletDynamics\Vehicle\btWheelInfo.h"> diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj index 22f9a81af..90b862b73 100644 --- a/msvc/8/libbulletmath.vcproj +++ b/msvc/8/libbulletmath.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release8\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletmath\" ObjectFile="..\..\out\release8\build\libbulletmath\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletmath\libbulletmath.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletmath\" ObjectFile="..\..\out\debug8\build\libbulletmath\" @@ -149,7 +149,7 @@ @@ -162,98 +162,56 @@ Name="Source Files" Filter=""> - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\GenQuickprof.cpp"> + RelativePath="..\..\src\LinearMath\GenAabbUtil2.h"> + RelativePath="..\..\src\LinearMath\GenIDebugDraw.h"> + RelativePath="..\..\src\LinearMath\GenList.h"> + RelativePath="..\..\src\LinearMath\GenMinMax.h"> + RelativePath="..\..\src\LinearMath\GenQuickprof.h"> + RelativePath="..\..\src\LinearMath\GenRandom.h"> + RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h"> + RelativePath="..\..\src\LinearMath\SimdMinMax.h"> + RelativePath="..\..\src\LinearMath\SimdPoint3.h"> + RelativePath="..\..\src\LinearMath\SimdQuadWord.h"> + RelativePath="..\..\src\LinearMath\SimdQuaternion.h"> + RelativePath="..\..\src\LinearMath\SimdScalar.h"> + RelativePath="..\..\src\LinearMath\SimdTransform.h"> + RelativePath="..\..\src\LinearMath\SimdTransformUtil.h"> - - - - - - - - - - - - - - - - + RelativePath="..\..\src\LinearMath\SimdVector3.h"> diff --git a/msvc/8/libbulletopenglsupport.vcproj b/msvc/8/libbulletopenglsupport.vcproj index 3f1923d2e..8fa228219 100644 --- a/msvc/8/libbulletopenglsupport.vcproj +++ b/msvc/8/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\release8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletopenglsupport\" ObjectFile="..\..\out\release8\build\libbulletopenglsupport\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug8\build\libbulletopenglsupport\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libbulletphysicsinterfacecommon.vcproj b/msvc/8/libbulletphysicsinterfacecommon.vcproj index df78a8e15..4b5e64b62 100644 --- a/msvc/8/libbulletphysicsinterfacecommon.vcproj +++ b/msvc/8/libbulletphysicsinterfacecommon.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\release8\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\release8\build\libbulletphysicsinterfacecommon\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath" + AdditionalIncludeDirectories=".;..\..;..\..\src" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletphysicsinterfacecommon\libbulletphysicsinterfacecommon.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletphysicsinterfacecommon\" ObjectFile="..\..\out\debug8\build\libbulletphysicsinterfacecommon\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libcollada-dom.vcproj b/msvc/8/libcollada-dom.vcproj index de55f985a..b856d6820 100644 --- a/msvc/8/libcollada-dom.vcproj +++ b/msvc/8/libcollada-dom.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release8\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\release8\build\libcollada-dom\" ObjectFile="..\..\out\release8\build\libcollada-dom\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug8\build\libcollada-dom\libcollada-dom.pch" AssemblerListingLocation="..\..\out\debug8\build\libcollada-dom\" ObjectFile="..\..\out\debug8\build\libcollada-dom\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libconvexdecomposition.vcproj b/msvc/8/libconvexdecomposition.vcproj index 490e3b69a..b348693d8 100644 --- a/msvc/8/libconvexdecomposition.vcproj +++ b/msvc/8/libconvexdecomposition.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\release8\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\release8\build\libconvexdecomposition\" ObjectFile="..\..\out\release8\build\libconvexdecomposition\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition" PrecompiledHeaderFile="..\..\out\debug8\build\libconvexdecomposition\libconvexdecomposition.pch" AssemblerListingLocation="..\..\out\debug8\build\libconvexdecomposition\" ObjectFile="..\..\out\debug8\build\libconvexdecomposition\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/liblibxml.vcproj b/msvc/8/liblibxml.vcproj index b4850c579..6fb4cb0f7 100644 --- a/msvc/8/liblibxml.vcproj +++ b/msvc/8/liblibxml.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release8\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\release8\build\liblibxml\" ObjectFile="..\..\out\release8\build\liblibxml\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug8\build\liblibxml\liblibxml.pch" AssemblerListingLocation="..\..\out\debug8\build\liblibxml\" ObjectFile="..\..\out\debug8\build\liblibxml\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index a5b926eae..c567fda00 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkL EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -38,10 +36,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "libbullet.vcproj", "{90F5975E-550B-EEC8-9A8A-B8581D3FCF97}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" @@ -62,8 +60,8 @@ Global ConfigName.1 = Debug EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -71,14 +69,14 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -86,38 +84,38 @@ Global {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -125,38 +123,38 @@ Global {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {330B5049-6935-5CE6-79B7-28F570962895}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {330B5049-6935-5CE6-79B7-28F570962895}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -172,20 +170,19 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -197,13 +194,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} @@ -257,10 +253,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 @@ -289,14 +281,14 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32 {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.ActiveCfg = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Release.Build.0 = Release|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.ActiveCfg = Debug|Win32 - {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}.Debug.Build.0 = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32 {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32 + {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32 {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32 diff --git a/Bullet/BroadphaseCollision/AxisSweep3.cpp b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp similarity index 99% rename from Bullet/BroadphaseCollision/AxisSweep3.cpp rename to src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp index c0f16c8ee..3e167f745 100644 --- a/Bullet/BroadphaseCollision/AxisSweep3.cpp +++ b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp @@ -17,7 +17,7 @@ // 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. // // 3. This notice may not be removed or altered from any source distribution. -#include "AxisSweep3.h" +#include "btAxisSweep3.h" #include diff --git a/Bullet/BroadphaseCollision/AxisSweep3.h b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h similarity index 96% rename from Bullet/BroadphaseCollision/AxisSweep3.h rename to src/BulletCollision/BroadphaseCollision/btAxisSweep3.h index bef8b66e0..7d7e78d55 100644 --- a/Bullet/BroadphaseCollision/AxisSweep3.h +++ b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h @@ -19,10 +19,10 @@ #ifndef AXIS_SWEEP_3_H #define AXIS_SWEEP_3_H -#include "SimdPoint3.h" -#include "SimdVector3.h" -#include "OverlappingPairCache.h" -#include "BroadphaseProxy.h" +#include "LinearMath/SimdPoint3.h" +#include "LinearMath/SimdVector3.h" +#include "btOverlappingPairCache.h" +#include "btBroadphaseProxy.h" /// AxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase. /// It uses arrays rather then lists for storage of the 3 axis. Also it operates using integer coordinates instead of floats. diff --git a/Bullet/BroadphaseCollision/BroadphaseInterface.h b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h similarity index 97% rename from Bullet/BroadphaseCollision/BroadphaseInterface.h rename to src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h index 3ca273bde..8e5bab336 100644 --- a/Bullet/BroadphaseCollision/BroadphaseInterface.h +++ b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h @@ -21,7 +21,7 @@ subject to the following restrictions: struct DispatcherInfo; class Dispatcher; struct BroadphaseProxy; -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" ///BroadphaseInterface for aabb-overlapping object pairs class BroadphaseInterface diff --git a/Bullet/BroadphaseCollision/BroadphaseProxy.cpp b/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp similarity index 96% rename from Bullet/BroadphaseCollision/BroadphaseProxy.cpp rename to src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp index 61bcdc4b6..f4d7341f8 100644 --- a/Bullet/BroadphaseCollision/BroadphaseProxy.cpp +++ b/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp @@ -13,5 +13,5 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "BroadphaseProxy.h" +#include "btBroadphaseProxy.h" diff --git a/Bullet/BroadphaseCollision/BroadphaseProxy.h b/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h similarity index 100% rename from Bullet/BroadphaseCollision/BroadphaseProxy.h rename to src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h diff --git a/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp b/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp similarity index 94% rename from Bullet/BroadphaseCollision/CollisionAlgorithm.cpp rename to src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp index d63966c83..c104fe86d 100644 --- a/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp +++ b/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp @@ -13,8 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CollisionAlgorithm.h" -#include "Dispatcher.h" +#include "btCollisionAlgorithm.h" +#include "btDispatcher.h" CollisionAlgorithm::CollisionAlgorithm(const CollisionAlgorithmConstructionInfo& ci) { diff --git a/Bullet/BroadphaseCollision/CollisionAlgorithm.h b/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h similarity index 100% rename from Bullet/BroadphaseCollision/CollisionAlgorithm.h rename to src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h diff --git a/Bullet/BroadphaseCollision/Dispatcher.cpp b/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp similarity index 97% rename from Bullet/BroadphaseCollision/Dispatcher.cpp rename to src/BulletCollision/BroadphaseCollision/btDispatcher.cpp index a73c7eac3..cd392935f 100644 --- a/Bullet/BroadphaseCollision/Dispatcher.cpp +++ b/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "Dispatcher.h" +#include "btDispatcher.h" Dispatcher::~Dispatcher() { diff --git a/Bullet/BroadphaseCollision/Dispatcher.h b/src/BulletCollision/BroadphaseCollision/btDispatcher.h similarity index 100% rename from Bullet/BroadphaseCollision/Dispatcher.h rename to src/BulletCollision/BroadphaseCollision/btDispatcher.h diff --git a/Bullet/BroadphaseCollision/OverlappingPairCache.cpp b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp similarity index 94% rename from Bullet/BroadphaseCollision/OverlappingPairCache.cpp rename to src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp index c099dc738..01c306dbb 100644 --- a/Bullet/BroadphaseCollision/OverlappingPairCache.cpp +++ b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp @@ -16,10 +16,10 @@ subject to the following restrictions: -#include "OverlappingPairCache.h" +#include "btOverlappingPairCache.h" -#include "Dispatcher.h" -#include "CollisionAlgorithm.h" +#include "btDispatcher.h" +#include "btCollisionAlgorithm.h" int gOverlappingPairs = 0; diff --git a/Bullet/BroadphaseCollision/OverlappingPairCache.h b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h similarity index 91% rename from Bullet/BroadphaseCollision/OverlappingPairCache.h rename to src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h index 05b2025f8..eadac3b36 100644 --- a/Bullet/BroadphaseCollision/OverlappingPairCache.h +++ b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h @@ -18,14 +18,17 @@ subject to the following restrictions: #define OVERLAPPING_PAIR_CACHE_H -#include "BroadphaseInterface.h" -#include "BroadphaseProxy.h" -#include "SimdPoint3.h" +#include "btBroadphaseInterface.h" +#include "btBroadphaseProxy.h" +#include "LinearMath/SimdPoint3.h" #include struct OverlapCallback { +virtual ~OverlapCallback() +{ +} //return true for deletion of the pair virtual bool ProcessOverlap(BroadphasePair& pair) = 0; }; diff --git a/Bullet/BroadphaseCollision/SimpleBroadphase.cpp b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp similarity index 94% rename from Bullet/BroadphaseCollision/SimpleBroadphase.cpp rename to src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp index 5733f0418..af8fe8a3c 100644 --- a/Bullet/BroadphaseCollision/SimpleBroadphase.cpp +++ b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp @@ -13,13 +13,13 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "SimpleBroadphase.h" -#include -#include +#include "btSimpleBroadphase.h" +#include +#include -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMatrix3x3.h" #include @@ -108,6 +108,10 @@ class RemovePairContainingProxy { BroadphaseProxy* m_targetProxy; + public: + virtual ~RemovePairContainingProxy() + { + } protected: virtual bool ProcessOverlap(BroadphasePair& pair) { diff --git a/Bullet/BroadphaseCollision/SimpleBroadphase.h b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h similarity index 98% rename from Bullet/BroadphaseCollision/SimpleBroadphase.h rename to src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h index 0b3054d90..daea95dfb 100644 --- a/Bullet/BroadphaseCollision/SimpleBroadphase.h +++ b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define SIMPLE_BROADPHASE_H -#include "OverlappingPairCache.h" +#include "btOverlappingPairCache.h" struct SimpleBroadphaseProxy : public BroadphaseProxy diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt new file mode 100644 index 000000000..f8e19c06b --- /dev/null +++ b/src/BulletCollision/CMakeLists.txt @@ -0,0 +1,57 @@ + +INCLUDE_DIRECTORIES( +${BULLET_PHYSICS_SOURCE_DIR}/src } +) + +ADD_LIBRARY(LibBulletCollision + BroadphaseCollision/btAxisSweep3.cpp + BroadphaseCollision/btBroadphaseProxy.cpp + BroadphaseCollision/btCollisionAlgorithm.cpp + BroadphaseCollision/btDispatcher.cpp + BroadphaseCollision/btOverlappingPairCache.cpp + BroadphaseCollision/btSimpleBroadphase.cpp + CollisionDispatch/btCollisionDispatcher.cpp + CollisionDispatch/btCollisionObject.cpp + CollisionDispatch/btCollisionWorld.cpp + CollisionDispatch/btCompoundCollisionAlgorithm.cpp + CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp + CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp + CollisionDispatch/btConvexConvexAlgorithm.cpp + CollisionDispatch/btEmptyCollisionAlgorithm.cpp + CollisionDispatch/btManifoldResult.cpp + CollisionDispatch/btSimulationIslandManager.cpp + CollisionDispatch/btUnionFind.cpp + CollisionShapes/btBoxShape.cpp + CollisionShapes/btBvhTriangleMeshShape.cpp + CollisionShapes/btCollisionShape.cpp + CollisionShapes/btCompoundShape.cpp + CollisionShapes/btConcaveShape.cpp + CollisionShapes/btConeShape.cpp + CollisionShapes/btConvexHullShape.cpp + CollisionShapes/btConvexShape.cpp + CollisionShapes/btConvexTriangleMeshShape.cpp + CollisionShapes/btCylinderShape.cpp + CollisionShapes/btEmptyShape.cpp + CollisionShapes/btMinkowskiSumShape.cpp + CollisionShapes/btMultiSphereShape.cpp + CollisionShapes/btOptimizedBvh.cpp + CollisionShapes/btPolyhedralConvexShape.cpp + CollisionShapes/btTetrahedronShape.cpp + CollisionShapes/btSphereShape.cpp + CollisionShapes/btStaticPlaneShape.cpp + CollisionShapes/btStridingMeshInterface.cpp + CollisionShapes/btTriangleCallback.cpp + CollisionShapes/btTriangleIndexVertexArray.cpp + CollisionShapes/btTriangleMesh.cpp + CollisionShapes/btTriangleMeshShape.cpp + NarrowPhaseCollision/btContinuousConvexCollision.cpp + NarrowPhaseCollision/btConvexCast.cpp + NarrowPhaseCollision/btGjkConvexCast.cpp + NarrowPhaseCollision/btGjkPairDetector.cpp + NarrowPhaseCollision/btManifoldContactAddResult.cpp + NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp + NarrowPhaseCollision/btPersistentManifold.cpp + NarrowPhaseCollision/btRaycastCallback.cpp + NarrowPhaseCollision/btSubSimplexConvexCast.cpp + NarrowPhaseCollision/btVoronoiSimplexSolver.cpp +) diff --git a/Bullet/CollisionDispatch/CollisionCreateFunc.h b/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h similarity index 100% rename from Bullet/CollisionDispatch/CollisionCreateFunc.h rename to src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h diff --git a/Bullet/CollisionDispatch/CollisionDispatcher.cpp b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp similarity index 93% rename from Bullet/CollisionDispatch/CollisionDispatcher.cpp rename to src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp index b49ff49ad..50cb74064 100644 --- a/Bullet/CollisionDispatch/CollisionDispatcher.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp @@ -14,18 +14,18 @@ subject to the following restrictions: */ -#include "CollisionDispatcher.h" +#include "btCollisionDispatcher.h" -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "CollisionDispatch/ConvexConvexAlgorithm.h" -#include "CollisionDispatch/EmptyCollisionAlgorithm.h" -#include "CollisionDispatch/ConvexConcaveCollisionAlgorithm.h" -#include "CollisionDispatch/CompoundCollisionAlgorithm.h" -#include "CollisionShapes/CollisionShape.h" -#include "CollisionDispatch/CollisionObject.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include -#include "BroadphaseCollision/OverlappingPairCache.h" +#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" int gNumManifold = 0; diff --git a/Bullet/CollisionDispatch/CollisionDispatcher.h b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h similarity index 92% rename from Bullet/CollisionDispatch/CollisionDispatcher.h rename to src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h index c2a85cf4d..f3641b431 100644 --- a/Bullet/CollisionDispatch/CollisionDispatcher.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h @@ -16,19 +16,19 @@ subject to the following restrictions: #ifndef COLLISION__DISPATCHER_H #define COLLISION__DISPATCHER_H -#include "BroadphaseCollision/Dispatcher.h" -#include "NarrowPhaseCollision/PersistentManifold.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" -#include "CollisionDispatch/ManifoldResult.h" +#include "BulletCollision/CollisionDispatch/btManifoldResult.h" -#include "BroadphaseCollision/BroadphaseProxy.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" class IDebugDraw; class OverlappingPairCache; -#include "CollisionCreateFunc.h" +#include "btCollisionCreateFunc.h" diff --git a/Bullet/CollisionDispatch/CollisionObject.cpp b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp similarity index 98% rename from Bullet/CollisionDispatch/CollisionObject.cpp rename to src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index a96707f5e..45b2b8fbd 100644 --- a/Bullet/CollisionDispatch/CollisionObject.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CollisionObject.h" +#include "btCollisionObject.h" CollisionObject::CollisionObject() : m_collisionFlags(0), diff --git a/Bullet/CollisionDispatch/CollisionObject.h b/src/BulletCollision/CollisionDispatch/btCollisionObject.h similarity index 98% rename from Bullet/CollisionDispatch/CollisionObject.h rename to src/BulletCollision/CollisionDispatch/btCollisionObject.h index 877a8fb72..352f31ede 100644 --- a/Bullet/CollisionDispatch/CollisionObject.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef COLLISION_OBJECT_H #define COLLISION_OBJECT_H -#include "SimdTransform.h" +#include "LinearMath/SimdTransform.h" //island management, m_activationState1 #define ACTIVE_TAG 1 diff --git a/Bullet/CollisionDispatch/CollisionWorld.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp similarity index 93% rename from Bullet/CollisionDispatch/CollisionWorld.cpp rename to src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp index a4aa7bcde..21e26aa60 100644 --- a/Bullet/CollisionDispatch/CollisionWorld.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp @@ -13,18 +13,18 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CollisionWorld.h" -#include "CollisionDispatcher.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionShapes/CollisionShape.h" -#include "CollisionShapes/SphereShape.h" //for raycasting -#include "CollisionShapes/TriangleMeshShape.h" //for raycasting -#include "NarrowPhaseCollision/RaycastCallback.h" -#include "CollisionShapes/CompoundShape.h" +#include "btCollisionWorld.h" +#include "btCollisionDispatcher.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" //for raycasting +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" //for raycasting +#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h" +#include "BulletCollision/CollisionShapes/btCompoundShape.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "BroadphaseCollision/BroadphaseInterface.h" -#include "AabbUtil2.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" +#include "LinearMath/GenAabbUtil2.h" #include diff --git a/Bullet/CollisionDispatch/CollisionWorld.h b/src/BulletCollision/CollisionDispatch/btCollisionWorld.h similarity index 97% rename from Bullet/CollisionDispatch/CollisionWorld.h rename to src/BulletCollision/CollisionDispatch/btCollisionWorld.h index 9a35a1035..3c140454b 100644 --- a/Bullet/CollisionDispatch/CollisionWorld.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -66,11 +66,11 @@ subject to the following restrictions: class CollisionShape; class BroadphaseInterface; -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "CollisionObject.h" -#include "CollisionDispatcher.h" //for definition of CollisionObjectArray -#include "BroadphaseCollision/OverlappingPairCache.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "btCollisionObject.h" +#include "btCollisionDispatcher.h" //for definition of CollisionObjectArray +#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" #include diff --git a/Bullet/CollisionDispatch/CompoundCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp similarity index 96% rename from Bullet/CollisionDispatch/CompoundCollisionAlgorithm.cpp rename to src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp index a29f0d492..ad05ae532 100644 --- a/Bullet/CollisionDispatch/CompoundCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CollisionDispatch/CompoundCollisionAlgorithm.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionShapes/CompoundShape.h" +#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionShapes/btCompoundShape.h" CompoundCollisionAlgorithm::CompoundCollisionAlgorithm( const CollisionAlgorithmConstructionInfo& ci,BroadphaseProxy* proxy0,BroadphaseProxy* proxy1) diff --git a/Bullet/CollisionDispatch/CompoundCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h similarity index 87% rename from Bullet/CollisionDispatch/CompoundCollisionAlgorithm.h rename to src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h index 9d9ef90c1..d346821d7 100644 --- a/Bullet/CollisionDispatch/CompoundCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h @@ -16,15 +16,15 @@ subject to the following restrictions: #ifndef COMPOUND_COLLISION_ALGORITHM_H #define COMPOUND_COLLISION_ALGORITHM_H -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "BroadphaseCollision/Dispatcher.h" -#include "BroadphaseCollision/BroadphaseInterface.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" -#include "NarrowPhaseCollision/PersistentManifold.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" class Dispatcher; -#include "BroadphaseCollision/BroadphaseProxy.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" #include -#include "CollisionCreateFunc.h" +#include "btCollisionCreateFunc.h" /// CompoundCollisionAlgorithm supports collision between CompoundCollisionShapes and other collision shapes /// Place holder, not fully implemented yet diff --git a/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp similarity index 93% rename from Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp rename to src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp index c863277f5..2cb6d5f73 100644 --- a/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp @@ -14,18 +14,18 @@ subject to the following restrictions: */ -#include "ConvexConcaveCollisionAlgorithm.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionShapes/MultiSphereShape.h" -#include "ConvexConvexAlgorithm.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "CollisionShapes/ConcaveShape.h" -#include "CollisionDispatch/ManifoldResult.h" -#include "NarrowPhaseCollision/RaycastCallback.h" -#include "CollisionShapes/TriangleShape.h" -#include "CollisionShapes/SphereShape.h" -#include "IDebugDraw.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" +#include "btConvexConcaveCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" +#include "btConvexConvexAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/CollisionShapes/btConcaveShape.h" +#include "BulletCollision/CollisionDispatch/btManifoldResult.h" +#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h" +#include "BulletCollision/CollisionShapes/btTriangleShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "LinearMath/GenIDebugDraw.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" ConvexConcaveCollisionAlgorithm::ConvexConcaveCollisionAlgorithm( const CollisionAlgorithmConstructionInfo& ci,BroadphaseProxy* proxy0,BroadphaseProxy* proxy1) : CollisionAlgorithm(ci),m_convex(*proxy0),m_concave(*proxy1), diff --git a/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h similarity index 88% rename from Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h rename to src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h index 53bf37449..94549015e 100644 --- a/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h @@ -16,14 +16,14 @@ subject to the following restrictions: #ifndef CONVEX_CONCAVE_COLLISION_ALGORITHM_H #define CONVEX_CONCAVE_COLLISION_ALGORITHM_H -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "BroadphaseCollision/Dispatcher.h" -#include "BroadphaseCollision/BroadphaseInterface.h" -#include "CollisionShapes/TriangleCallback.h" -#include "NarrowPhaseCollision/PersistentManifold.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" +#include "BulletCollision/CollisionShapes/btTriangleCallback.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" class Dispatcher; -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "CollisionCreateFunc.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "btCollisionCreateFunc.h" ///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), ProcessTriangle is called. class ConvexTriangleCallback : public TriangleCallback diff --git a/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp similarity index 90% rename from Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp rename to src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp index 2e896989a..d53e47e62 100644 --- a/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp @@ -13,31 +13,31 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "ConvexConvexAlgorithm.h" +#include "btConvexConvexAlgorithm.h" #include -#include "NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h" -#include "BroadphaseCollision/BroadphaseInterface.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionShapes/ConvexShape.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "CollisionShapes/BoxShape.h" -#include "CollisionDispatch/ManifoldResult.h" +#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionDispatch/btManifoldResult.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" -#include "NarrowPhaseCollision/ContinuousConvexCollision.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "NarrowPhaseCollision/GjkConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionShapes/SphereShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" //#include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h" diff --git a/Bullet/CollisionDispatch/ConvexConvexAlgorithm.h b/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h similarity index 87% rename from Bullet/CollisionDispatch/ConvexConvexAlgorithm.h rename to src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h index 939d9ea42..2c3e660b9 100644 --- a/Bullet/CollisionDispatch/ConvexConvexAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h @@ -16,12 +16,12 @@ subject to the following restrictions: #ifndef CONVEX_CONVEX_ALGORITHM_H #define CONVEX_CONVEX_ALGORITHM_H -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "CollisionCreateFunc.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "btCollisionCreateFunc.h" class ConvexPenetrationDepthSolver; diff --git a/Bullet/CollisionDispatch/EmptyCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp similarity index 97% rename from Bullet/CollisionDispatch/EmptyCollisionAlgorithm.cpp rename to src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp index 6ef31ad6f..8ed38034c 100644 --- a/Bullet/CollisionDispatch/EmptyCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "EmptyCollisionAlgorithm.h" +#include "btEmptyCollisionAlgorithm.h" diff --git a/Bullet/CollisionDispatch/EmptyCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h similarity index 94% rename from Bullet/CollisionDispatch/EmptyCollisionAlgorithm.h rename to src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h index d337bcd58..12a7f0607 100644 --- a/Bullet/CollisionDispatch/EmptyCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h @@ -15,8 +15,8 @@ subject to the following restrictions: #ifndef EMPTY_ALGORITH #define EMPTY_ALGORITH -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "CollisionCreateFunc.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "btCollisionCreateFunc.h" #define ATTRIBUTE_ALIGNED(a) diff --git a/Bullet/CollisionDispatch/ManifoldResult.cpp b/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp similarity index 95% rename from Bullet/CollisionDispatch/ManifoldResult.cpp rename to src/BulletCollision/CollisionDispatch/btManifoldResult.cpp index 36f7255a7..7bc5e828e 100644 --- a/Bullet/CollisionDispatch/ManifoldResult.cpp +++ b/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: */ -#include "ManifoldResult.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "CollisionDispatch/CollisionObject.h" +#include "btManifoldResult.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" ///This is to allow MaterialCombiner/Custom Friction/Restitution values diff --git a/Bullet/CollisionDispatch/ManifoldResult.h b/src/BulletCollision/CollisionDispatch/btManifoldResult.h similarity index 95% rename from Bullet/CollisionDispatch/ManifoldResult.h rename to src/BulletCollision/CollisionDispatch/btManifoldResult.h index fe2438980..72bcdc4e8 100644 --- a/Bullet/CollisionDispatch/ManifoldResult.h +++ b/src/BulletCollision/CollisionDispatch/btManifoldResult.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef MANIFOLD_RESULT_H #define MANIFOLD_RESULT_H -#include "NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" struct CollisionObject; class PersistentManifold; class ManifoldPoint; diff --git a/Bullet/CollisionDispatch/SimulationIslandManager.cpp b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp similarity index 92% rename from Bullet/CollisionDispatch/SimulationIslandManager.cpp rename to src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp index d9b7d4b21..a06b01cb7 100644 --- a/Bullet/CollisionDispatch/SimulationIslandManager.cpp +++ b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp @@ -1,9 +1,9 @@ -#include "SimulationIslandManager.h" -#include "BroadphaseCollision/Dispatcher.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "CollisionDispatch/CollisionObject.h" -#include "CollisionDispatch/CollisionWorld.h" +#include "btSimulationIslandManager.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" #include #include diff --git a/Bullet/CollisionDispatch/SimulationIslandManager.h b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h similarity index 92% rename from Bullet/CollisionDispatch/SimulationIslandManager.h rename to src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h index 4c1b68f67..ca28685d8 100644 --- a/Bullet/CollisionDispatch/SimulationIslandManager.h +++ b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef SIMULATION_ISLAND_MANAGER_H #define SIMULATION_ISLAND_MANAGER_H -#include "CollisionDispatch/UnionFind.h" -#include "CollisionCreateFunc.h" +#include "BulletCollision/CollisionDispatch/btUnionFind.h" +#include "btCollisionCreateFunc.h" class CollisionWorld; class Dispatcher; diff --git a/Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp similarity index 90% rename from Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.cpp rename to src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp index 52beffaef..6e2bd93b2 100644 --- a/Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp @@ -13,10 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "SphereSphereCollisionAlgorithm.h" -#include "CollisionDispatch/CollisionDispatcher.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionDispatch/CollisionObject.h" +#include "btSphereSphereCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" SphereSphereCollisionAlgorithm::SphereSphereCollisionAlgorithm(PersistentManifold* mf,const CollisionAlgorithmConstructionInfo& ci,BroadphaseProxy* proxy0,BroadphaseProxy* proxy1) : CollisionAlgorithm(ci), diff --git a/Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h similarity index 89% rename from Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.h rename to src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h index b9557e72f..58647d79e 100644 --- a/Bullet/CollisionDispatch/SphereSphereCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h @@ -16,9 +16,9 @@ subject to the following restrictions: #ifndef SPHERE_SPHERE_COLLISION_ALGORITHM_H #define SPHERE_SPHERE_COLLISION_ALGORITHM_H -#include "BroadphaseCollision/CollisionAlgorithm.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "CollisionDispatch/CollisionCreateFunc.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" class PersistentManifold; /// SphereSphereCollisionAlgorithm provides sphere-sphere collision detection. diff --git a/Bullet/CollisionDispatch/UnionFind.cpp b/src/BulletCollision/CollisionDispatch/btUnionFind.cpp similarity index 98% rename from Bullet/CollisionDispatch/UnionFind.cpp rename to src/BulletCollision/CollisionDispatch/btUnionFind.cpp index f7f4895a7..23602e0f5 100644 --- a/Bullet/CollisionDispatch/UnionFind.cpp +++ b/src/BulletCollision/CollisionDispatch/btUnionFind.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "UnionFind.h" +#include "btUnionFind.h" #include #include diff --git a/Bullet/CollisionDispatch/UnionFind.h b/src/BulletCollision/CollisionDispatch/btUnionFind.h similarity index 100% rename from Bullet/CollisionDispatch/UnionFind.h rename to src/BulletCollision/CollisionDispatch/btUnionFind.h diff --git a/Bullet/CollisionShapes/BoxShape.cpp b/src/BulletCollision/CollisionShapes/btBoxShape.cpp similarity index 98% rename from Bullet/CollisionShapes/BoxShape.cpp rename to src/BulletCollision/CollisionShapes/btBoxShape.cpp index 2be1996da..3ffeda648 100644 --- a/Bullet/CollisionShapes/BoxShape.cpp +++ b/src/BulletCollision/CollisionShapes/btBoxShape.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "BoxShape.h" +#include "btBoxShape.h" SimdVector3 BoxShape::GetHalfExtents() const { diff --git a/Bullet/CollisionShapes/BoxShape.h b/src/BulletCollision/CollisionShapes/btBoxShape.h similarity index 96% rename from Bullet/CollisionShapes/BoxShape.h rename to src/BulletCollision/CollisionShapes/btBoxShape.h index 8b07ccd2e..fe8c2579a 100644 --- a/Bullet/CollisionShapes/BoxShape.h +++ b/src/BulletCollision/CollisionShapes/btBoxShape.h @@ -16,11 +16,11 @@ subject to the following restrictions: #ifndef OBB_BOX_MINKOWSKI_H #define OBB_BOX_MINKOWSKI_H -#include "PolyhedralConvexShape.h" -#include "CollisionShapes/CollisionMargin.h" -#include "BroadphaseCollision/BroadphaseProxy.h" -#include "SimdPoint3.h" -#include "SimdMinMax.h" +#include "btPolyhedralConvexShape.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "LinearMath/SimdPoint3.h" +#include "LinearMath/SimdMinMax.h" ///BoxShape implements both a feature based (vertex/edge/plane) and implicit (getSupportingVertex) Box class BoxShape: public PolyhedralConvexShape diff --git a/Bullet/CollisionShapes/BvhTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp similarity index 96% rename from Bullet/CollisionShapes/BvhTriangleMeshShape.cpp rename to src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp index d2624dcdf..065492381 100644 --- a/Bullet/CollisionShapes/BvhTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp @@ -16,8 +16,8 @@ subject to the following restrictions: //#define DISABLE_BVH -#include "CollisionShapes/BvhTriangleMeshShape.h" -#include "CollisionShapes/OptimizedBvh.h" +#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btOptimizedBvh.h" ///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization. ///Uses an interface to access the triangles to allow for sharing graphics/physics triangles. diff --git a/Bullet/CollisionShapes/BvhTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h similarity index 93% rename from Bullet/CollisionShapes/BvhTriangleMeshShape.h rename to src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h index 849ea2e99..7858d5aa4 100644 --- a/Bullet/CollisionShapes/BvhTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef BVH_TRIANGLE_MESH_SHAPE_H #define BVH_TRIANGLE_MESH_SHAPE_H -#include "CollisionShapes/TriangleMeshShape.h" -#include "CollisionShapes/OptimizedBvh.h" +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btOptimizedBvh.h" ///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization. ///Uses an interface to access the triangles to allow for sharing graphics/physics triangles. diff --git a/Bullet/CollisionShapes/CollisionMargin.h b/src/BulletCollision/CollisionShapes/btCollisionMargin.h similarity index 100% rename from Bullet/CollisionShapes/CollisionMargin.h rename to src/BulletCollision/CollisionShapes/btCollisionMargin.h diff --git a/Bullet/CollisionShapes/CollisionShape.cpp b/src/BulletCollision/CollisionShapes/btCollisionShape.cpp similarity index 97% rename from Bullet/CollisionShapes/CollisionShape.cpp rename to src/BulletCollision/CollisionShapes/btCollisionShape.cpp index 0c5e48aeb..0e53da838 100644 --- a/Bullet/CollisionShapes/CollisionShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CollisionShapes/CollisionShape.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" void CollisionShape::GetBoundingSphere(SimdVector3& center,SimdScalar& radius) const { diff --git a/Bullet/CollisionShapes/CollisionShape.h b/src/BulletCollision/CollisionShapes/btCollisionShape.h similarity index 91% rename from Bullet/CollisionShapes/CollisionShape.h rename to src/BulletCollision/CollisionShapes/btCollisionShape.h index 771d2180b..9a7fd3044 100644 --- a/Bullet/CollisionShapes/CollisionShape.h +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -16,11 +16,11 @@ subject to the following restrictions: #ifndef COLLISION_SHAPE_H #define COLLISION_SHAPE_H -#include "SimdTransform.h" -#include "SimdVector3.h" -#include -#include "SimdPoint3.h" -#include "BroadphaseCollision/BroadphaseProxy.h" //for the shape types +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdVector3.h" +#include +#include "LinearMath/SimdPoint3.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types ///CollisionShape provides generic interface for collidable objects class CollisionShape diff --git a/Bullet/CollisionShapes/CompoundShape.cpp b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp similarity index 98% rename from Bullet/CollisionShapes/CompoundShape.cpp rename to src/BulletCollision/CollisionShapes/btCompoundShape.cpp index ecb117013..053c1335a 100644 --- a/Bullet/CollisionShapes/CompoundShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp @@ -13,10 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "CompoundShape.h" +#include "btCompoundShape.h" -#include "CollisionShape.h" +#include "btCollisionShape.h" CompoundShape::CompoundShape() diff --git a/Bullet/CollisionShapes/CompoundShape.h b/src/BulletCollision/CollisionShapes/btCompoundShape.h similarity index 93% rename from Bullet/CollisionShapes/CompoundShape.h rename to src/BulletCollision/CollisionShapes/btCompoundShape.h index 7a43e44c2..5d42e14f4 100644 --- a/Bullet/CollisionShapes/CompoundShape.h +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.h @@ -16,13 +16,13 @@ subject to the following restrictions: #ifndef COMPOUND_SHAPE_H #define COMPOUND_SHAPE_H -#include "CollisionShape.h" +#include "btCollisionShape.h" -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMatrix3x3.h" #include -#include "CollisionShapes/CollisionMargin.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" class OptimizedBvh; diff --git a/Bullet/CollisionShapes/ConcaveShape.cpp b/src/BulletCollision/CollisionShapes/btConcaveShape.cpp similarity index 97% rename from Bullet/CollisionShapes/ConcaveShape.cpp rename to src/BulletCollision/CollisionShapes/btConcaveShape.cpp index c060a4df5..29f62828d 100644 --- a/Bullet/CollisionShapes/ConcaveShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConcaveShape.cpp @@ -15,7 +15,7 @@ subject to the following restrictions: */ -#include "ConcaveShape.h" +#include "btConcaveShape.h" ConcaveShape::ConcaveShape() : m_collisionMargin(0.f) { diff --git a/Bullet/CollisionShapes/ConcaveShape.h b/src/BulletCollision/CollisionShapes/btConcaveShape.h similarity index 90% rename from Bullet/CollisionShapes/ConcaveShape.h rename to src/BulletCollision/CollisionShapes/btConcaveShape.h index d6c589dd8..06b5ed91b 100644 --- a/Bullet/CollisionShapes/ConcaveShape.h +++ b/src/BulletCollision/CollisionShapes/btConcaveShape.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef CONCAVE_SHAPE_H #define CONCAVE_SHAPE_H -#include "CollisionShapes/CollisionShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types -#include "TriangleCallback.h" +#include "btTriangleCallback.h" ///Concave shape proves an interface concave shapes that can produce triangles that overlapping a given AABB. diff --git a/Bullet/CollisionShapes/ConeShape.cpp b/src/BulletCollision/CollisionShapes/btConeShape.cpp similarity index 97% rename from Bullet/CollisionShapes/ConeShape.cpp rename to src/BulletCollision/CollisionShapes/btConeShape.cpp index fb99c2c44..f8a2658de 100644 --- a/Bullet/CollisionShapes/ConeShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConeShape.cpp @@ -13,8 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "ConeShape.h" -#include "SimdPoint3.h" +#include "btConeShape.h" +#include "LinearMath/SimdPoint3.h" #ifdef WIN32 static int coneindices[3] = {1,2,0}; diff --git a/Bullet/CollisionShapes/ConeShape.h b/src/BulletCollision/CollisionShapes/btConeShape.h similarity index 95% rename from Bullet/CollisionShapes/ConeShape.h rename to src/BulletCollision/CollisionShapes/btConeShape.h index b7408df13..e4c5a61d8 100644 --- a/Bullet/CollisionShapes/ConeShape.h +++ b/src/BulletCollision/CollisionShapes/btConeShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef CONE_MINKOWSKI_H #define CONE_MINKOWSKI_H -#include "ConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types /// implements cone shape interface class ConeShape : public ConvexShape diff --git a/Bullet/CollisionShapes/ConvexHullShape.cpp b/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp similarity index 96% rename from Bullet/CollisionShapes/ConvexHullShape.cpp rename to src/BulletCollision/CollisionShapes/btConvexHullShape.cpp index ec333addc..c767ed2e8 100644 --- a/Bullet/CollisionShapes/ConvexHullShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp @@ -12,10 +12,10 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "ConvexHullShape.h" -#include "CollisionShapes/CollisionMargin.h" +#include "btConvexHullShape.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" -#include "SimdQuaternion.h" +#include "LinearMath/SimdQuaternion.h" ConvexHullShape ::ConvexHullShape (SimdPoint3* points,int numPoints,int stride) diff --git a/Bullet/CollisionShapes/ConvexHullShape.h b/src/BulletCollision/CollisionShapes/btConvexHullShape.h similarity index 95% rename from Bullet/CollisionShapes/ConvexHullShape.h rename to src/BulletCollision/CollisionShapes/btConvexHullShape.h index e442b5685..32a332d62 100644 --- a/Bullet/CollisionShapes/ConvexHullShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexHullShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef CONVEX_HULL_SHAPE_H #define CONVEX_HULL_SHAPE_H -#include "PolyhedralConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btPolyhedralConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types #include diff --git a/Bullet/CollisionShapes/ConvexShape.cpp b/src/BulletCollision/CollisionShapes/btConvexShape.cpp similarity index 98% rename from Bullet/CollisionShapes/ConvexShape.cpp rename to src/BulletCollision/CollisionShapes/btConvexShape.cpp index b60fa2dcc..585335476 100644 --- a/Bullet/CollisionShapes/ConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "ConvexShape.h" +#include "btConvexShape.h" ConvexShape::ConvexShape() :m_collisionMargin(CONVEX_DISTANCE_MARGIN), diff --git a/Bullet/CollisionShapes/ConvexShape.h b/src/BulletCollision/CollisionShapes/btConvexShape.h similarity index 92% rename from Bullet/CollisionShapes/ConvexShape.h rename to src/BulletCollision/CollisionShapes/btConvexShape.h index db067fe5c..9e5e71fef 100644 --- a/Bullet/CollisionShapes/ConvexShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexShape.h @@ -16,13 +16,13 @@ subject to the following restrictions: #ifndef CONVEX_SHAPE_INTERFACE1 #define CONVEX_SHAPE_INTERFACE1 -#include "CollisionShape.h" +#include "btCollisionShape.h" -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMatrix3x3.h" #include -#include "CollisionShapes/CollisionMargin.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" //todo: get rid of this ConvexCastResult thing! struct ConvexCastResult; diff --git a/Bullet/CollisionShapes/ConvexTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp similarity index 91% rename from Bullet/CollisionShapes/ConvexTriangleMeshShape.cpp rename to src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp index ecccc7b79..bd048bd8a 100644 --- a/Bullet/CollisionShapes/ConvexTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp @@ -12,11 +12,11 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "ConvexTriangleMeshShape.h" -#include "CollisionShapes/CollisionMargin.h" +#include "btConvexTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" -#include "SimdQuaternion.h" -#include "CollisionShapes/StridingMeshInterface.h" +#include "LinearMath/SimdQuaternion.h" +#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h" ConvexTriangleMeshShape ::ConvexTriangleMeshShape (StridingMeshInterface* meshInterface) diff --git a/Bullet/CollisionShapes/ConvexTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h similarity index 90% rename from Bullet/CollisionShapes/ConvexTriangleMeshShape.h rename to src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h index 7631473f7..d2bffe9f7 100644 --- a/Bullet/CollisionShapes/ConvexTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h @@ -2,8 +2,8 @@ #define CONVEX_TRIANGLEMESH_SHAPE_H -#include "PolyhedralConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btPolyhedralConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types #include diff --git a/Bullet/CollisionShapes/CylinderShape.cpp b/src/BulletCollision/CollisionShapes/btCylinderShape.cpp similarity index 98% rename from Bullet/CollisionShapes/CylinderShape.cpp rename to src/BulletCollision/CollisionShapes/btCylinderShape.cpp index 49163b457..a4f3bfe46 100644 --- a/Bullet/CollisionShapes/CylinderShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.cpp @@ -12,8 +12,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "CylinderShape.h" -#include "SimdPoint3.h" +#include "btCylinderShape.h" +#include "LinearMath/SimdPoint3.h" CylinderShape::CylinderShape (const SimdVector3& halfExtents) :BoxShape(halfExtents) diff --git a/Bullet/CollisionShapes/CylinderShape.h b/src/BulletCollision/CollisionShapes/btCylinderShape.h similarity index 96% rename from Bullet/CollisionShapes/CylinderShape.h rename to src/BulletCollision/CollisionShapes/btCylinderShape.h index b99e3fa8c..38bb03f07 100644 --- a/Bullet/CollisionShapes/CylinderShape.h +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -16,9 +16,9 @@ subject to the following restrictions: #ifndef CYLINDER_MINKOWSKI_H #define CYLINDER_MINKOWSKI_H -#include "BoxShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types -#include "SimdVector3.h" +#include "btBoxShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types +#include "LinearMath/SimdVector3.h" /// implements cylinder shape interface class CylinderShape : public BoxShape diff --git a/Bullet/CollisionShapes/EmptyShape.cpp b/src/BulletCollision/CollisionShapes/btEmptyShape.cpp similarity index 96% rename from Bullet/CollisionShapes/EmptyShape.cpp rename to src/BulletCollision/CollisionShapes/btEmptyShape.cpp index 939377c72..ffeae712b 100644 --- a/Bullet/CollisionShapes/EmptyShape.cpp +++ b/src/BulletCollision/CollisionShapes/btEmptyShape.cpp @@ -13,10 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "EmptyShape.h" +#include "btEmptyShape.h" -#include "CollisionShape.h" +#include "btCollisionShape.h" EmptyShape::EmptyShape() diff --git a/Bullet/CollisionShapes/EmptyShape.h b/src/BulletCollision/CollisionShapes/btEmptyShape.h similarity index 90% rename from Bullet/CollisionShapes/EmptyShape.h rename to src/BulletCollision/CollisionShapes/btEmptyShape.h index 4407a22ac..619563775 100644 --- a/Bullet/CollisionShapes/EmptyShape.h +++ b/src/BulletCollision/CollisionShapes/btEmptyShape.h @@ -16,13 +16,13 @@ subject to the following restrictions: #ifndef EMPTY_SHAPE_H #define EMPTY_SHAPE_H -#include "ConcaveShape.h" +#include "btConcaveShape.h" -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdMatrix3x3.h" #include -#include "CollisionShapes/CollisionMargin.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/Bullet/CollisionShapes/MinkowskiSumShape.cpp b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp similarity index 98% rename from Bullet/CollisionShapes/MinkowskiSumShape.cpp rename to src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp index 9bd6f9c35..5c6c76fe4 100644 --- a/Bullet/CollisionShapes/MinkowskiSumShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "MinkowskiSumShape.h" +#include "btMinkowskiSumShape.h" MinkowskiSumShape::MinkowskiSumShape(ConvexShape* shapeA,ConvexShape* shapeB) diff --git a/Bullet/CollisionShapes/MinkowskiSumShape.h b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h similarity index 95% rename from Bullet/CollisionShapes/MinkowskiSumShape.h rename to src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h index 69dee7c03..ef959132a 100644 --- a/Bullet/CollisionShapes/MinkowskiSumShape.h +++ b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef MINKOWSKI_SUM_SHAPE_H #define MINKOWSKI_SUM_SHAPE_H -#include "ConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types /// MinkowskiSumShape represents implicit (getSupportingVertex) based minkowski sum of two convex implicit shapes. class MinkowskiSumShape : public ConvexShape diff --git a/Bullet/CollisionShapes/MultiSphereShape.cpp b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp similarity index 96% rename from Bullet/CollisionShapes/MultiSphereShape.cpp rename to src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index 83d1a72d6..4e8f162c6 100644 --- a/Bullet/CollisionShapes/MultiSphereShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "MultiSphereShape.h" -#include "CollisionShapes/CollisionMargin.h" -#include "SimdQuaternion.h" +#include "btMultiSphereShape.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" +#include "LinearMath/SimdQuaternion.h" MultiSphereShape::MultiSphereShape (const SimdVector3& inertiaHalfExtents,const SimdVector3* positions,const SimdScalar* radi,int numSpheres) :m_inertiaHalfExtents(inertiaHalfExtents) diff --git a/Bullet/CollisionShapes/MultiSphereShape.h b/src/BulletCollision/CollisionShapes/btMultiSphereShape.h similarity index 94% rename from Bullet/CollisionShapes/MultiSphereShape.h rename to src/BulletCollision/CollisionShapes/btMultiSphereShape.h index 19c9d978f..be2f9fe56 100644 --- a/Bullet/CollisionShapes/MultiSphereShape.h +++ b/src/BulletCollision/CollisionShapes/btMultiSphereShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef MULTI_SPHERE_MINKOWSKI_H #define MULTI_SPHERE_MINKOWSKI_H -#include "ConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types #define MAX_NUM_SPHERES 5 diff --git a/Bullet/CollisionShapes/OptimizedBvh.cpp b/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp similarity index 98% rename from Bullet/CollisionShapes/OptimizedBvh.cpp rename to src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp index 498c29e50..843b6fad4 100644 --- a/Bullet/CollisionShapes/OptimizedBvh.cpp +++ b/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "OptimizedBvh.h" -#include "StridingMeshInterface.h" -#include "AabbUtil2.h" +#include "btOptimizedBvh.h" +#include "btStridingMeshInterface.h" +#include "LinearMath/GenAabbUtil2.h" diff --git a/Bullet/CollisionShapes/OptimizedBvh.h b/src/BulletCollision/CollisionShapes/btOptimizedBvh.h similarity index 98% rename from Bullet/CollisionShapes/OptimizedBvh.h rename to src/BulletCollision/CollisionShapes/btOptimizedBvh.h index 5fef1695c..324c6c0af 100644 --- a/Bullet/CollisionShapes/OptimizedBvh.h +++ b/src/BulletCollision/CollisionShapes/btOptimizedBvh.h @@ -15,7 +15,7 @@ subject to the following restrictions: #ifndef OPTIMIZED_BVH_H #define OPTIMIZED_BVH_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" #include class StridingMeshInterface; diff --git a/Bullet/CollisionShapes/PolyhedralConvexShape.cpp b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp similarity index 97% rename from Bullet/CollisionShapes/PolyhedralConvexShape.cpp rename to src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp index 3aaf7c059..a62965e21 100644 --- a/Bullet/CollisionShapes/PolyhedralConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include +#include PolyhedralConvexShape::PolyhedralConvexShape() :m_optionalHull(0) diff --git a/Bullet/CollisionShapes/PolyhedralConvexShape.h b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h similarity index 94% rename from Bullet/CollisionShapes/PolyhedralConvexShape.h rename to src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h index ae3462b51..f6c8f1c01 100644 --- a/Bullet/CollisionShapes/PolyhedralConvexShape.h +++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h @@ -16,9 +16,9 @@ subject to the following restrictions: #ifndef BU_SHAPE #define BU_SHAPE -#include -#include -#include +#include +#include +#include ///PolyhedralConvexShape is an interface class for feature based (vertex/edge/face) convex shapes. diff --git a/Bullet/CollisionShapes/SphereShape.cpp b/src/BulletCollision/CollisionShapes/btSphereShape.cpp similarity index 94% rename from Bullet/CollisionShapes/SphereShape.cpp rename to src/BulletCollision/CollisionShapes/btSphereShape.cpp index 28c46a28a..2203f44c0 100644 --- a/Bullet/CollisionShapes/SphereShape.cpp +++ b/src/BulletCollision/CollisionShapes/btSphereShape.cpp @@ -13,10 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "SphereShape.h" -#include "CollisionShapes/CollisionMargin.h" +#include "btSphereShape.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" -#include "SimdQuaternion.h" +#include "LinearMath/SimdQuaternion.h" SphereShape ::SphereShape (SimdScalar radius) diff --git a/Bullet/CollisionShapes/SphereShape.h b/src/BulletCollision/CollisionShapes/btSphereShape.h similarity index 95% rename from Bullet/CollisionShapes/SphereShape.h rename to src/BulletCollision/CollisionShapes/btSphereShape.h index d93174c7b..72a2e8af4 100644 --- a/Bullet/CollisionShapes/SphereShape.h +++ b/src/BulletCollision/CollisionShapes/btSphereShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef SPHERE_MINKOWSKI_H #define SPHERE_MINKOWSKI_H -#include "ConvexShape.h" -#include "BroadphaseCollision/BroadphaseProxy.h" // for the types +#include "btConvexShape.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types ///SphereShape implements an implicit (getSupportingVertex) Sphere class SphereShape : public ConvexShape diff --git a/Bullet/CollisionShapes/StaticPlaneShape.cpp b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp similarity index 97% rename from Bullet/CollisionShapes/StaticPlaneShape.cpp rename to src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp index 48aecf5e5..f4858e208 100644 --- a/Bullet/CollisionShapes/StaticPlaneShape.cpp +++ b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "StaticPlaneShape.h" +#include "btStaticPlaneShape.h" -#include "SimdTransformUtil.h" +#include "LinearMath/SimdTransformUtil.h" StaticPlaneShape::StaticPlaneShape(const SimdVector3& planeNormal,SimdScalar planeConstant) diff --git a/Bullet/CollisionShapes/StaticPlaneShape.h b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h similarity index 97% rename from Bullet/CollisionShapes/StaticPlaneShape.h rename to src/BulletCollision/CollisionShapes/btStaticPlaneShape.h index f26d21031..d4ad2ba7a 100644 --- a/Bullet/CollisionShapes/StaticPlaneShape.h +++ b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef STATIC_PLANE_SHAPE_H #define STATIC_PLANE_SHAPE_H -#include "CollisionShapes/ConcaveShape.h" +#include "BulletCollision/CollisionShapes/btConcaveShape.h" ///StaticPlaneShape simulates an 'infinite' plane by dynamically reporting triangles approximated by intersection of the plane with the AABB. diff --git a/Bullet/CollisionShapes/StridingMeshInterface.cpp b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp similarity index 99% rename from Bullet/CollisionShapes/StridingMeshInterface.cpp rename to src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp index 3fd9f1b1c..98cb65cf1 100644 --- a/Bullet/CollisionShapes/StridingMeshInterface.cpp +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "StridingMeshInterface.h" +#include "btStridingMeshInterface.h" StridingMeshInterface::~StridingMeshInterface() { diff --git a/Bullet/CollisionShapes/StridingMeshInterface.h b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h similarity index 98% rename from Bullet/CollisionShapes/StridingMeshInterface.h rename to src/BulletCollision/CollisionShapes/btStridingMeshInterface.h index 0b482afdc..021acc9b9 100644 --- a/Bullet/CollisionShapes/StridingMeshInterface.h +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef STRIDING_MESHINTERFACE_H #define STRIDING_MESHINTERFACE_H -#include "SimdVector3.h" -#include "TriangleCallback.h" +#include "LinearMath/SimdVector3.h" +#include "btTriangleCallback.h" /// PHY_ScalarType enumerates possible scalar types. /// See the StridingMeshInterface for its use diff --git a/Bullet/CollisionShapes/Simplex1to4Shape.cpp b/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp similarity index 97% rename from Bullet/CollisionShapes/Simplex1to4Shape.cpp rename to src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp index e1d02f956..6d4205b79 100644 --- a/Bullet/CollisionShapes/Simplex1to4Shape.cpp +++ b/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp @@ -13,8 +13,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "Simplex1to4Shape.h" -#include "SimdMatrix3x3.h" +#include "btTetrahedronShape.h" +#include "LinearMath/SimdMatrix3x3.h" BU_Simplex1to4::BU_Simplex1to4() :m_numVertices(0) diff --git a/Bullet/CollisionShapes/Simplex1to4Shape.h b/src/BulletCollision/CollisionShapes/btTetrahedronShape.h similarity index 94% rename from Bullet/CollisionShapes/Simplex1to4Shape.h rename to src/BulletCollision/CollisionShapes/btTetrahedronShape.h index 8e5d124f3..54a28ab25 100644 --- a/Bullet/CollisionShapes/Simplex1to4Shape.h +++ b/src/BulletCollision/CollisionShapes/btTetrahedronShape.h @@ -17,8 +17,8 @@ subject to the following restrictions: #define BU_SIMPLEX_1TO4_SHAPE -#include -#include "BroadphaseCollision/BroadphaseProxy.h" +#include +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" ///BU_Simplex1to4 implements feature based and implicit simplex of up to 4 vertices (tetrahedron, triangle, line, vertex). diff --git a/Bullet/CollisionShapes/TriangleCallback.cpp b/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp similarity index 97% rename from Bullet/CollisionShapes/TriangleCallback.cpp rename to src/BulletCollision/CollisionShapes/btTriangleCallback.cpp index 499d377a0..d242bf54f 100644 --- a/Bullet/CollisionShapes/TriangleCallback.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "TriangleCallback.h" +#include "btTriangleCallback.h" TriangleCallback::~TriangleCallback() { diff --git a/Bullet/CollisionShapes/TriangleCallback.h b/src/BulletCollision/CollisionShapes/btTriangleCallback.h similarity index 97% rename from Bullet/CollisionShapes/TriangleCallback.h rename to src/BulletCollision/CollisionShapes/btTriangleCallback.h index 810d4e626..8374160c1 100644 --- a/Bullet/CollisionShapes/TriangleCallback.h +++ b/src/BulletCollision/CollisionShapes/btTriangleCallback.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef TRIANGLE_CALLBACK_H #define TRIANGLE_CALLBACK_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" class TriangleCallback diff --git a/Bullet/CollisionShapes/TriangleIndexVertexArray.cpp b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp similarity index 98% rename from Bullet/CollisionShapes/TriangleIndexVertexArray.cpp rename to src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp index d01d87d3f..3a18f024d 100644 --- a/Bullet/CollisionShapes/TriangleIndexVertexArray.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "TriangleIndexVertexArray.h" +#include "btTriangleIndexVertexArray.h" TriangleIndexVertexArray::TriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,float* vertexBase,int vertexStride) { diff --git a/Bullet/CollisionShapes/TriangleIndexVertexArray.h b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h similarity index 98% rename from Bullet/CollisionShapes/TriangleIndexVertexArray.h rename to src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h index a44ef4514..e056e553f 100644 --- a/Bullet/CollisionShapes/TriangleIndexVertexArray.h +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "StridingMeshInterface.h" +#include "btStridingMeshInterface.h" #include ///IndexedMesh indexes into existing vertex and index arrays, in a similar way OpenGL glDrawElements diff --git a/Bullet/CollisionShapes/TriangleMesh.cpp b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp similarity index 98% rename from Bullet/CollisionShapes/TriangleMesh.cpp rename to src/BulletCollision/CollisionShapes/btTriangleMesh.cpp index c86d286d9..f7d47dd30 100644 --- a/Bullet/CollisionShapes/TriangleMesh.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "TriangleMesh.h" +#include "btTriangleMesh.h" #include static int myindices[3] = {0,1,2}; diff --git a/Bullet/CollisionShapes/TriangleMesh.h b/src/BulletCollision/CollisionShapes/btTriangleMesh.h similarity index 96% rename from Bullet/CollisionShapes/TriangleMesh.h rename to src/BulletCollision/CollisionShapes/btTriangleMesh.h index 9623cb401..9e86a2c30 100644 --- a/Bullet/CollisionShapes/TriangleMesh.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.h @@ -17,9 +17,9 @@ subject to the following restrictions: #ifndef TRIANGLE_MESH_H #define TRIANGLE_MESH_H -#include "CollisionShapes/StridingMeshInterface.h" +#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h" #include -#include +#include struct MyTriangle { diff --git a/Bullet/CollisionShapes/TriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp similarity index 95% rename from Bullet/CollisionShapes/TriangleMeshShape.cpp rename to src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp index f00ee280f..e33b5d8e0 100644 --- a/Bullet/CollisionShapes/TriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp @@ -13,12 +13,12 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "TriangleMeshShape.h" -#include "SimdVector3.h" -#include "SimdQuaternion.h" -#include "StridingMeshInterface.h" -#include "AabbUtil2.h" -#include "CollisionShapes/CollisionMargin.h" +#include "btTriangleMeshShape.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdQuaternion.h" +#include "btStridingMeshInterface.h" +#include "LinearMath/GenAabbUtil2.h" +#include "BulletCollision/CollisionShapes/btCollisionMargin.h" #include "stdio.h" diff --git a/Bullet/CollisionShapes/TriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h similarity index 94% rename from Bullet/CollisionShapes/TriangleMeshShape.h rename to src/BulletCollision/CollisionShapes/btTriangleMeshShape.h index a6ee965da..491736df6 100644 --- a/Bullet/CollisionShapes/TriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef TRIANGLE_MESH_SHAPE_H #define TRIANGLE_MESH_SHAPE_H -#include "CollisionShapes/ConcaveShape.h" -#include "CollisionShapes/StridingMeshInterface.h" +#include "BulletCollision/CollisionShapes/btConcaveShape.h" +#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h" ///Concave triangle mesh. Uses an interface to access the triangles to allow for sharing graphics/physics triangles. diff --git a/Bullet/CollisionShapes/TriangleShape.h b/src/BulletCollision/CollisionShapes/btTriangleShape.h similarity index 97% rename from Bullet/CollisionShapes/TriangleShape.h rename to src/BulletCollision/CollisionShapes/btTriangleShape.h index d1b4a9930..f0b3944ad 100644 --- a/Bullet/CollisionShapes/TriangleShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleShape.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef OBB_TRIANGLE_MINKOWSKI_H #define OBB_TRIANGLE_MINKOWSKI_H -#include "ConvexShape.h" -#include "CollisionShapes/BoxShape.h" +#include "btConvexShape.h" +#include "BulletCollision/CollisionShapes/btBoxShape.h" class TriangleShape : public PolyhedralConvexShape { diff --git a/Bullet/Doxyfile b/src/BulletCollision/Doxyfile similarity index 100% rename from Bullet/Doxyfile rename to src/BulletCollision/Doxyfile diff --git a/Bullet/Jamfile b/src/BulletCollision/Jamfile similarity index 64% rename from Bullet/Jamfile rename to src/BulletCollision/Jamfile index a2d3b9676..53c325396 100644 --- a/Bullet/Jamfile +++ b/src/BulletCollision/Jamfile @@ -1,8 +1,8 @@ -SubDir TOP Bullet ; +SubDir TOP src BulletCollision ; -Description bullet : "Bullet Continuous Collision Detection and Physics Library" ; -Library bullet : +Description bulletcollision : "Bullet Collision Detection" ; +Library bulletcollision : [ Wildcard BroadphaseCollision : *.h *.cpp ] [ Wildcard CollisionDispatch : *.h *.cpp ] [ Wildcard CollisionShapes : *.h *.cpp ] diff --git a/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp b/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp similarity index 92% rename from Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp rename to src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp index 710208a91..f7a842f37 100644 --- a/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp @@ -14,15 +14,15 @@ subject to the following restrictions: */ -#include "ContinuousConvexCollision.h" -#include "CollisionShapes/ConvexShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" -#include "SimdTransformUtil.h" -#include "CollisionShapes/SphereShape.h" +#include "btContinuousConvexCollision.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" +#include "LinearMath/SimdTransformUtil.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "GjkPairDetector.h" -#include "PointCollector.h" +#include "btGjkPairDetector.h" +#include "btPointCollector.h" diff --git a/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h b/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h similarity index 97% rename from Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h rename to src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h index 0128f19f6..2c36617f5 100644 --- a/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h +++ b/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h @@ -17,8 +17,8 @@ subject to the following restrictions: #ifndef CONTINUOUS_COLLISION_CONVEX_CAST_H #define CONTINUOUS_COLLISION_CONVEX_CAST_H -#include "ConvexCast.h" -#include "SimplexSolverInterface.h" +#include "btConvexCast.h" +#include "btSimplexSolverInterface.h" class ConvexPenetrationDepthSolver; class ConvexShape; diff --git a/Bullet/NarrowPhaseCollision/ConvexCast.cpp b/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp similarity index 97% rename from Bullet/NarrowPhaseCollision/ConvexCast.cpp rename to src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp index 689655086..a52355c9a 100644 --- a/Bullet/NarrowPhaseCollision/ConvexCast.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "ConvexCast.h" +#include "btConvexCast.h" ConvexCast::~ConvexCast() { diff --git a/Bullet/NarrowPhaseCollision/ConvexCast.h b/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h similarity index 93% rename from Bullet/NarrowPhaseCollision/ConvexCast.h rename to src/BulletCollision/NarrowPhaseCollision/btConvexCast.h index 22c0966df..3be6dde27 100644 --- a/Bullet/NarrowPhaseCollision/ConvexCast.h +++ b/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h @@ -17,11 +17,11 @@ subject to the following restrictions: #ifndef CONVEX_CAST_H #define CONVEX_CAST_H -#include -#include -#include +#include +#include +#include class MinkowskiSumShape; -#include "IDebugDraw.h" +#include "LinearMath/GenIDebugDraw.h" /// ConvexCast is an interface for Casting class ConvexCast diff --git a/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h b/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h similarity index 95% rename from Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h rename to src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h index 8f8c0a97e..e7409e497 100644 --- a/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h +++ b/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h @@ -18,9 +18,9 @@ subject to the following restrictions: #define CONVEX_PENETRATION_DEPTH_H class SimdVector3; -#include "SimplexSolverInterface.h" +#include "btSimplexSolverInterface.h" class ConvexShape; -#include "SimdPoint3.h" +#include "LinearMath/SimdPoint3.h" class SimdTransform; ///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation. diff --git a/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h b/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h similarity index 97% rename from Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h rename to src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h index da5ecc2d7..a39b37a4c 100644 --- a/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h +++ b/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef DISCRETE_COLLISION_DETECTOR_INTERFACE_H #define DISCRETE_COLLISION_DETECTOR_INTERFACE_H -#include "SimdTransform.h" -#include "SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "LinearMath/SimdVector3.h" /// This interface is made to be used by an iterative approach to do TimeOfImpact calculations diff --git a/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp b/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp similarity index 95% rename from Bullet/NarrowPhaseCollision/GjkConvexCast.cpp rename to src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp index 2b494e459..a9c506f5a 100644 --- a/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp @@ -15,11 +15,11 @@ subject to the following restrictions: -#include "GjkConvexCast.h" -#include "CollisionShapes/SphereShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "GjkPairDetector.h" -#include "PointCollector.h" +#include "btGjkConvexCast.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" +#include "btGjkPairDetector.h" +#include "btPointCollector.h" GjkConvexCast::GjkConvexCast(ConvexShape* convexA,ConvexShape* convexB,SimplexSolverInterface* simplexSolver) diff --git a/Bullet/NarrowPhaseCollision/GjkConvexCast.h b/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h similarity index 90% rename from Bullet/NarrowPhaseCollision/GjkConvexCast.h rename to src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h index c83ffc12f..00f9ffe48 100644 --- a/Bullet/NarrowPhaseCollision/GjkConvexCast.h +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h @@ -18,13 +18,13 @@ subject to the following restrictions: #ifndef GJK_CONVEX_CAST_H #define GJK_CONVEX_CAST_H -#include +#include -#include "SimdVector3.h" -#include "ConvexCast.h" +#include "LinearMath/SimdVector3.h" +#include "btConvexCast.h" class ConvexShape; class MinkowskiSumShape; -#include "SimplexSolverInterface.h" +#include "btSimplexSolverInterface.h" ///GjkConvexCast performs a raycast on a convex object using support mapping. class GjkConvexCast : public ConvexCast diff --git a/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp b/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp similarity index 96% rename from Bullet/NarrowPhaseCollision/GjkPairDetector.cpp rename to src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp index b6353ff12..8e28d1e58 100644 --- a/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp @@ -13,10 +13,10 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "GjkPairDetector.h" -#include "CollisionShapes/ConvexShape.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" -#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" +#include "btGjkPairDetector.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" #if defined(DEBUG) || defined (_DEBUG) #include //for debug printf diff --git a/Bullet/NarrowPhaseCollision/GjkPairDetector.h b/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h similarity index 92% rename from Bullet/NarrowPhaseCollision/GjkPairDetector.h rename to src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h index 5eee81e82..d202586ad 100644 --- a/Bullet/NarrowPhaseCollision/GjkPairDetector.h +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h @@ -19,13 +19,13 @@ subject to the following restrictions: #ifndef GJK_PAIR_DETECTOR_H #define GJK_PAIR_DETECTOR_H -#include "DiscreteCollisionDetectorInterface.h" -#include "SimdPoint3.h" +#include "btDiscreteCollisionDetectorInterface.h" +#include "LinearMath/SimdPoint3.h" -#include +#include class ConvexShape; -#include "SimplexSolverInterface.h" +#include "btSimplexSolverInterface.h" class ConvexPenetrationDepthSolver; /// GjkPairDetector uses GJK to implement the DiscreteCollisionDetectorInterface diff --git a/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp b/src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.cpp similarity index 94% rename from Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp rename to src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.cpp index ad97b9579..a46bff8a5 100644 --- a/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.cpp @@ -13,8 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "ManifoldContactAddResult.h" -#include "NarrowPhaseCollision/PersistentManifold.h" +#include "btManifoldContactAddResult.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" ManifoldContactAddResult::ManifoldContactAddResult(SimdTransform transA,SimdTransform transB,PersistentManifold* manifoldPtr) :m_manifoldPtr(manifoldPtr) diff --git a/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.h b/src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.h similarity index 94% rename from Bullet/NarrowPhaseCollision/ManifoldContactAddResult.h rename to src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.h index 5dc9f3129..a8e78bccd 100644 --- a/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.h +++ b/src/BulletCollision/NarrowPhaseCollision/btManifoldContactAddResult.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef MANIFOLD_CONTACT_ADD_RESULT_H #define MANIFOLD_CONTACT_ADD_RESULT_H -#include "NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h" +#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" class PersistentManifold; class ManifoldContactAddResult : public DiscreteCollisionDetectorInterface::Result diff --git a/Bullet/NarrowPhaseCollision/ManifoldPoint.h b/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h similarity index 97% rename from Bullet/NarrowPhaseCollision/ManifoldPoint.h rename to src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h index 250d9a9a8..80ddd9bf3 100644 --- a/Bullet/NarrowPhaseCollision/ManifoldPoint.h +++ b/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef MANIFOLD_CONTACT_POINT_H #define MANIFOLD_CONTACT_POINT_H -#include "SimdVector3.h" -#include "SimdTransformUtil.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransformUtil.h" diff --git a/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp b/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp similarity index 95% rename from Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp rename to src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp index 70b856c32..cead7907a 100644 --- a/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp @@ -13,11 +13,11 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "MinkowskiPenetrationDepthSolver.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/SubSimplexConvexCast.h" -#include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/GjkPairDetector.h" +#include "btMinkowskiPenetrationDepthSolver.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" +#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" +#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" struct MyResult : public DiscreteCollisionDetectorInterface::Result diff --git a/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h b/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h similarity index 97% rename from Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h rename to src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h index b7a0da3a0..ae9f6b975 100644 --- a/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h +++ b/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef MINKOWSKI_PENETRATION_DEPTH_SOLVER_H #define MINKOWSKI_PENETRATION_DEPTH_SOLVER_H -#include "ConvexPenetrationDepthSolver.h" +#include "btConvexPenetrationDepthSolver.h" ///MinkowskiPenetrationDepthSolver implements bruteforce penetration depth estimation. ///Implementation is based on sampling the depth using support mapping, and using GJK step to get the witness points. diff --git a/Bullet/NarrowPhaseCollision/PersistentManifold.cpp b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp similarity index 98% rename from Bullet/NarrowPhaseCollision/PersistentManifold.cpp rename to src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp index 39227e3ea..590d0e9c3 100644 --- a/Bullet/NarrowPhaseCollision/PersistentManifold.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp @@ -14,8 +14,8 @@ subject to the following restrictions: */ -#include "PersistentManifold.h" -#include "SimdTransform.h" +#include "btPersistentManifold.h" +#include "LinearMath/SimdTransform.h" #include float gContactBreakingTreshold = 0.02f; diff --git a/Bullet/NarrowPhaseCollision/PersistentManifold.h b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h similarity index 97% rename from Bullet/NarrowPhaseCollision/PersistentManifold.h rename to src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index 53895be9a..f0093fdfb 100644 --- a/Bullet/NarrowPhaseCollision/PersistentManifold.h +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -17,9 +17,9 @@ subject to the following restrictions: #define PERSISTENT_MANIFOLD_H -#include "SimdVector3.h" -#include "SimdTransform.h" -#include "ManifoldPoint.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" +#include "btManifoldPoint.h" struct CollisionResult; diff --git a/Bullet/NarrowPhaseCollision/PointCollector.h b/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h similarity index 97% rename from Bullet/NarrowPhaseCollision/PointCollector.h rename to src/BulletCollision/NarrowPhaseCollision/btPointCollector.h index 9d1daf01c..16a570161 100644 --- a/Bullet/NarrowPhaseCollision/PointCollector.h +++ b/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef POINT_COLLECTOR_H #define POINT_COLLECTOR_H -#include "DiscreteCollisionDetectorInterface.h" +#include "btDiscreteCollisionDetectorInterface.h" diff --git a/Bullet/NarrowPhaseCollision/RaycastCallback.cpp b/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp similarity index 98% rename from Bullet/NarrowPhaseCollision/RaycastCallback.cpp rename to src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp index 209d9612b..926a47cf6 100644 --- a/Bullet/NarrowPhaseCollision/RaycastCallback.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp @@ -14,7 +14,7 @@ subject to the following restrictions: */ -#include "RaycastCallback.h" +#include "btRaycastCallback.h" TriangleRaycastCallback::TriangleRaycastCallback(const SimdVector3& from,const SimdVector3& to) : diff --git a/Bullet/NarrowPhaseCollision/RaycastCallback.h b/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h similarity index 95% rename from Bullet/NarrowPhaseCollision/RaycastCallback.h rename to src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h index 463c576c5..a4f132b76 100644 --- a/Bullet/NarrowPhaseCollision/RaycastCallback.h +++ b/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef RAYCAST_TRI_CALLBACK_H #define RAYCAST_TRI_CALLBACK_H -#include "CollisionShapes/TriangleCallback.h" +#include "BulletCollision/CollisionShapes/btTriangleCallback.h" struct BroadphaseProxy; diff --git a/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h b/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h similarity index 95% rename from Bullet/NarrowPhaseCollision/SimplexSolverInterface.h rename to src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h index 6a15d8e4f..f773fe606 100644 --- a/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h +++ b/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h @@ -18,12 +18,12 @@ subject to the following restrictions: #ifndef SIMPLEX_SOLVER_INTERFACE_H #define SIMPLEX_SOLVER_INTERFACE_H -#include "SimdVector3.h" -#include "SimdPoint3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdPoint3.h" #define NO_VIRTUAL_INTERFACE 1 #ifdef NO_VIRTUAL_INTERFACE -#include "VoronoiSimplexSolver.h" +#include "btVoronoiSimplexSolver.h" #define SimplexSolverInterface VoronoiSimplexSolver #else diff --git a/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp b/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp similarity index 93% rename from Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp rename to src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp index a91326198..8a3733c1f 100644 --- a/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp @@ -14,10 +14,10 @@ subject to the following restrictions: */ -#include "SubSimplexConvexCast.h" -#include "CollisionShapes/ConvexShape.h" -#include "CollisionShapes/MinkowskiSumShape.h" -#include "NarrowPhaseCollision/SimplexSolverInterface.h" +#include "btSubSimplexConvexCast.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" +#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" SubsimplexConvexCast::SubsimplexConvexCast (ConvexShape* convexA,ConvexShape* convexB,SimplexSolverInterface* simplexSolver) diff --git a/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h b/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h similarity index 97% rename from Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h rename to src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h index 9fc58e133..6908cfed2 100644 --- a/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h +++ b/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h @@ -17,8 +17,8 @@ subject to the following restrictions: #ifndef SUBSIMPLEX_CONVEX_CAST_H #define SUBSIMPLEX_CONVEX_CAST_H -#include "ConvexCast.h" -#include "SimplexSolverInterface.h" +#include "btConvexCast.h" +#include "btSimplexSolverInterface.h" class ConvexShape; /// SubsimplexConvexCast implements Gino van den Bergens' paper diff --git a/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp b/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp similarity index 99% rename from Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp rename to src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp index f0b69cfe7..ee01f230a 100644 --- a/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp @@ -24,7 +24,7 @@ subject to the following restrictions: */ -#include "VoronoiSimplexSolver.h" +#include "btVoronoiSimplexSolver.h" #include #include diff --git a/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h b/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h similarity index 99% rename from Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h rename to src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h index defa071b9..0d1ac72bf 100644 --- a/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h +++ b/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h @@ -18,7 +18,7 @@ subject to the following restrictions: #ifndef VoronoiSimplexSolver_H #define VoronoiSimplexSolver_H -#include "SimplexSolverInterface.h" +#include "btSimplexSolverInterface.h" diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt new file mode 100644 index 000000000..3dfa71950 --- /dev/null +++ b/src/BulletDynamics/CMakeLists.txt @@ -0,0 +1,17 @@ +INCLUDE_DIRECTORIES( +${BULLET_PHYSICS_SOURCE_DIR}/src } +) + +ADD_LIBRARY(LibBulletDynamics + + ConstraintSolver/btContactConstraint.cpp + ConstraintSolver/btGeneric6DofConstraint.cpp + ConstraintSolver/btHingeConstraint.cpp + ConstraintSolver/btPoint2PointConstraint.cpp + ConstraintSolver/btSequentialImpulseConstraintSolver.cpp + ConstraintSolver/btSolve2LinearConstraint.cpp + ConstraintSolver/btTypedConstraint.cpp + Dynamics/btRigidBody.cpp + Vehicle/btRaycastVehicle.cpp + Vehicle/btWheelInfo.cpp +) diff --git a/BulletDynamics/ConstraintSolver/ConstraintSolver.h b/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h similarity index 100% rename from BulletDynamics/ConstraintSolver/ConstraintSolver.h rename to src/BulletDynamics/ConstraintSolver/btConstraintSolver.h diff --git a/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp similarity index 96% rename from BulletDynamics/ConstraintSolver/ContactConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp index 6019e4dee..617a1ec0a 100644 --- a/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp @@ -14,13 +14,13 @@ subject to the following restrictions: */ -#include "ContactConstraint.h" -#include "Dynamics/RigidBody.h" -#include "SimdVector3.h" -#include "JacobianEntry.h" -#include "ContactSolverInfo.h" -#include "GEN_MinMax.h" -#include "NarrowPhaseCollision/ManifoldPoint.h" +#include "btContactConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "LinearMath/SimdVector3.h" +#include "btJacobianEntry.h" +#include "btContactSolverInfo.h" +#include "LinearMath/GenMinMax.h" +#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" #define ASSERT2 assert diff --git a/BulletDynamics/ConstraintSolver/ContactConstraint.h b/src/BulletDynamics/ConstraintSolver/btContactConstraint.h similarity index 97% rename from BulletDynamics/ConstraintSolver/ContactConstraint.h rename to src/BulletDynamics/ConstraintSolver/btContactConstraint.h index fb5f1fd75..1cb7a9642 100644 --- a/BulletDynamics/ConstraintSolver/ContactConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btContactConstraint.h @@ -19,8 +19,8 @@ subject to the following restrictions: //todo: make into a proper class working with the iterative constraint solver class RigidBody; -#include "SimdVector3.h" -#include "SimdScalar.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdScalar.h" struct ContactSolverInfo; class ManifoldPoint; diff --git a/BulletDynamics/ConstraintSolver/ContactSolverInfo.h b/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h similarity index 100% rename from BulletDynamics/ConstraintSolver/ContactSolverInfo.h rename to src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h diff --git a/BulletDynamics/ConstraintSolver/Generic6DofConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp similarity index 97% rename from BulletDynamics/ConstraintSolver/Generic6DofConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp index 3cfa70497..0cf85232a 100644 --- a/BulletDynamics/ConstraintSolver/Generic6DofConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp @@ -14,10 +14,10 @@ subject to the following restrictions: */ -#include "Generic6DofConstraint.h" -#include "Dynamics/RigidBody.h" -#include "Dynamics/MassProps.h" -#include "SimdTransformUtil.h" +#include "btGeneric6DofConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/Dynamics/btMassProps.h" +#include "LinearMath/SimdTransformUtil.h" static const SimdScalar kSign[] = { 1.0f, -1.0f, 1.0f }; static const int kAxisA[] = { 1, 0, 0 }; diff --git a/BulletDynamics/ConstraintSolver/Generic6DofConstraint.h b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h similarity index 96% rename from BulletDynamics/ConstraintSolver/Generic6DofConstraint.h rename to src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h index 7a7725350..e697fc938 100644 --- a/BulletDynamics/ConstraintSolver/Generic6DofConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef GENERIC_6DOF_CONSTRAINT_H #define GENERIC_6DOF_CONSTRAINT_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" -#include "ConstraintSolver/JacobianEntry.h" -#include "TypedConstraint.h" +#include "BulletDynamics/ConstraintSolver/btJacobianEntry.h" +#include "btTypedConstraint.h" class RigidBody; diff --git a/BulletDynamics/ConstraintSolver/HingeConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp similarity index 98% rename from BulletDynamics/ConstraintSolver/HingeConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp index fb7f1f47c..eaf84b632 100644 --- a/BulletDynamics/ConstraintSolver/HingeConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp @@ -14,10 +14,10 @@ subject to the following restrictions: */ -#include "HingeConstraint.h" -#include "Dynamics/RigidBody.h" -#include "Dynamics/MassProps.h" -#include "SimdTransformUtil.h" +#include "btHingeConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/Dynamics/btMassProps.h" +#include "LinearMath/SimdTransformUtil.h" HingeConstraint::HingeConstraint() diff --git a/BulletDynamics/ConstraintSolver/HingeConstraint.h b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h similarity index 94% rename from BulletDynamics/ConstraintSolver/HingeConstraint.h rename to src/BulletDynamics/ConstraintSolver/btHingeConstraint.h index a43463511..8144cfd81 100644 --- a/BulletDynamics/ConstraintSolver/HingeConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef HINGECONSTRAINT_H #define HINGECONSTRAINT_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" -#include "ConstraintSolver/JacobianEntry.h" -#include "TypedConstraint.h" +#include "BulletDynamics/ConstraintSolver/btJacobianEntry.h" +#include "btTypedConstraint.h" class RigidBody; diff --git a/BulletDynamics/ConstraintSolver/JacobianEntry.h b/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h similarity index 98% rename from BulletDynamics/ConstraintSolver/JacobianEntry.h rename to src/BulletDynamics/ConstraintSolver/btJacobianEntry.h index d1dd367a0..55b87e62a 100644 --- a/BulletDynamics/ConstraintSolver/JacobianEntry.h +++ b/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef JACOBIAN_ENTRY_H #define JACOBIAN_ENTRY_H -#include "SimdVector3.h" -#include "Dynamics/RigidBody.h" +#include "LinearMath/SimdVector3.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" //notes: diff --git a/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp similarity index 96% rename from BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp index b3e25e0fb..9dbfa32a4 100644 --- a/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: */ -#include "Point2PointConstraint.h" -#include "Dynamics/RigidBody.h" -#include "Dynamics/MassProps.h" +#include "btPoint2PointConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/Dynamics/btMassProps.h" diff --git a/BulletDynamics/ConstraintSolver/Point2PointConstraint.h b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h similarity index 94% rename from BulletDynamics/ConstraintSolver/Point2PointConstraint.h rename to src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h index bd28ac7b1..af38c9792 100644 --- a/BulletDynamics/ConstraintSolver/Point2PointConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef POINT2POINTCONSTRAINT_H #define POINT2POINTCONSTRAINT_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" -#include "ConstraintSolver/JacobianEntry.h" -#include "TypedConstraint.h" +#include "BulletDynamics/ConstraintSolver/btJacobianEntry.h" +#include "btTypedConstraint.h" class RigidBody; diff --git a/BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp similarity index 96% rename from BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.cpp rename to src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index 32cda736a..01a80fc79 100644 --- a/BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.cpp +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -14,20 +14,18 @@ subject to the following restrictions: */ -#include "SequentialImpulseConstraintSolver.h" -#include "NarrowPhaseCollision/PersistentManifold.h" -#include "Dynamics/RigidBody.h" -#include "ContactConstraint.h" -#include "Solve2LinearConstraint.h" -#include "ContactSolverInfo.h" -#include "Dynamics/BU_Joint.h" -#include "Dynamics/ContactJoint.h" -#include "IDebugDraw.h" -#include "JacobianEntry.h" -#include "GEN_MinMax.h" +#include "btSequentialImpulseConstraintSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "btContactConstraint.h" +#include "btSolve2LinearConstraint.h" +#include "btContactSolverInfo.h" +#include "LinearMath/GenIDebugDraw.h" +#include "btJacobianEntry.h" +#include "LinearMath/GenMinMax.h" #ifdef USE_PROFILE -#include "quickprof.h" +#include "LinearMath/GenQuickprof.h" #endif //USE_PROFILE int totalCpd = 0; diff --git a/BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.h b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h similarity index 97% rename from BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.h rename to src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h index c51006abf..df39ed351 100644 --- a/BulletDynamics/ConstraintSolver/SequentialImpulseConstraintSolver.h +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H #define SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H -#include "ConstraintSolver.h" +#include "btConstraintSolver.h" class IDebugDraw; -#include "ContactConstraint.h" +#include "btContactConstraint.h" diff --git a/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp similarity index 97% rename from BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp index 34bf3e488..788fdfca8 100644 --- a/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp @@ -15,11 +15,11 @@ subject to the following restrictions: -#include "Solve2LinearConstraint.h" +#include "btSolve2LinearConstraint.h" -#include "Dynamics/RigidBody.h" -#include "SimdVector3.h" -#include "JacobianEntry.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "LinearMath/SimdVector3.h" +#include "btJacobianEntry.h" void Solve2LinearConstraint::resolveUnilateralPairConstraint( diff --git a/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h b/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h similarity index 97% rename from BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h rename to src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h index 4a0986abf..2ca9b08bd 100644 --- a/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef SOLVE_2LINEAR_CONSTRAINT_H #define SOLVE_2LINEAR_CONSTRAINT_H -#include "SimdMatrix3x3.h" -#include "SimdVector3.h" +#include "LinearMath/SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" class RigidBody; diff --git a/BulletDynamics/ConstraintSolver/TypedConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp similarity index 92% rename from BulletDynamics/ConstraintSolver/TypedConstraint.cpp rename to src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp index 61ea8ace7..490a6f570 100644 --- a/BulletDynamics/ConstraintSolver/TypedConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp @@ -14,9 +14,9 @@ subject to the following restrictions: */ -#include "TypedConstraint.h" -#include "Dynamics/RigidBody.h" -#include "Dynamics/MassProps.h" +#include "btTypedConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/Dynamics/btMassProps.h" static RigidBody s_fixed(MassProps(0,SimdVector3(0.f,0.f,0.f)),0.f,0.f,1.f,1.f); diff --git a/BulletDynamics/ConstraintSolver/TypedConstraint.h b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h similarity index 98% rename from BulletDynamics/ConstraintSolver/TypedConstraint.h rename to src/BulletDynamics/ConstraintSolver/btTypedConstraint.h index bc90814de..05ef88188 100644 --- a/BulletDynamics/ConstraintSolver/TypedConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define TYPED_CONSTRAINT_H class RigidBody; -#include "SimdScalar.h" +#include "LinearMath/SimdScalar.h" //TypedConstraint is the baseclass for Bullet constraints and vehicles class TypedConstraint diff --git a/BulletDynamics/Dynamics/MassProps.h b/src/BulletDynamics/Dynamics/btMassProps.h similarity index 97% rename from BulletDynamics/Dynamics/MassProps.h rename to src/BulletDynamics/Dynamics/btMassProps.h index b98010a68..93ecb4cf6 100644 --- a/BulletDynamics/Dynamics/MassProps.h +++ b/src/BulletDynamics/Dynamics/btMassProps.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef MASS_PROPS_H #define MASS_PROPS_H -#include +#include struct MassProps { MassProps(float mass,const SimdVector3& inertiaLocal): diff --git a/BulletDynamics/Dynamics/RigidBody.cpp b/src/BulletDynamics/Dynamics/btRigidBody.cpp similarity index 96% rename from BulletDynamics/Dynamics/RigidBody.cpp rename to src/BulletDynamics/Dynamics/btRigidBody.cpp index 8be8ff196..41abca406 100644 --- a/BulletDynamics/Dynamics/RigidBody.cpp +++ b/src/BulletDynamics/Dynamics/btRigidBody.cpp @@ -13,11 +13,11 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "RigidBody.h" -#include "MassProps.h" -#include "CollisionShapes/ConvexShape.h" -#include "GEN_MinMax.h" -#include +#include "btRigidBody.h" +#include "btMassProps.h" +#include "BulletCollision/CollisionShapes/btConvexShape.h" +#include "LinearMath/GenMinMax.h" +#include float gLinearAirDamping = 1.f; diff --git a/BulletDynamics/Dynamics/RigidBody.h b/src/BulletDynamics/Dynamics/btRigidBody.h similarity index 96% rename from BulletDynamics/Dynamics/RigidBody.h rename to src/BulletDynamics/Dynamics/btRigidBody.h index d8392046f..82a30f4f4 100644 --- a/BulletDynamics/Dynamics/RigidBody.h +++ b/src/BulletDynamics/Dynamics/btRigidBody.h @@ -17,12 +17,12 @@ subject to the following restrictions: #define RIGIDBODY_H #include -#include -#include -#include "BroadphaseCollision/BroadphaseProxy.h" +#include +#include +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "CollisionDispatch/CollisionObject.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" class CollisionShape; struct MassProps; diff --git a/BulletDynamics/Jamfile b/src/BulletDynamics/Jamfile similarity index 54% rename from BulletDynamics/Jamfile rename to src/BulletDynamics/Jamfile index 493bebfcf..cce52b671 100644 --- a/BulletDynamics/Jamfile +++ b/src/BulletDynamics/Jamfile @@ -1,6 +1,7 @@ -SubDir TOP BulletDynamics ; +SubDir TOP src BulletDynamics ; -Library bulletdynamics : +Description bulletdynamics : "Bullet Rigidbody Dynamics" ; +Library bulletdynamics : [ Wildcard ConstraintSolver : *.h *.cpp ] [ Wildcard Dynamics : *.h *.cpp ] [ Wildcard Vehicle : *.h *.cpp ] diff --git a/BulletDynamics/Vehicle/RaycastVehicle.cpp b/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp similarity index 94% rename from BulletDynamics/Vehicle/RaycastVehicle.cpp rename to src/BulletDynamics/Vehicle/btRaycastVehicle.cpp index d84fc586a..b062d4215 100644 --- a/BulletDynamics/Vehicle/RaycastVehicle.cpp +++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp @@ -9,17 +9,17 @@ * It is provided "as is" without express or implied warranty. */ -#include "RaycastVehicle.h" -#include "ConstraintSolver/Solve2LinearConstraint.h" -#include "ConstraintSolver/JacobianEntry.h" -#include "SimdQuaternion.h" -#include "SimdVector3.h" -#include "VehicleRaycaster.h" -#include "WheelInfo.h" +#include "btRaycastVehicle.h" +#include "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h" +#include "BulletDynamics/ConstraintSolver/btJacobianEntry.h" +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdVector3.h" +#include "btVehicleRaycaster.h" +#include "btWheelInfo.h" -#include "Dynamics/MassProps.h" -#include "ConstraintSolver/ContactConstraint.h" +#include "BulletDynamics/Dynamics/btMassProps.h" +#include "BulletDynamics/ConstraintSolver/btContactConstraint.h" diff --git a/BulletDynamics/Vehicle/RaycastVehicle.h b/src/BulletDynamics/Vehicle/btRaycastVehicle.h similarity index 92% rename from BulletDynamics/Vehicle/RaycastVehicle.h rename to src/BulletDynamics/Vehicle/btRaycastVehicle.h index 3410f03d7..dc65bea85 100644 --- a/BulletDynamics/Vehicle/RaycastVehicle.h +++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.h @@ -11,11 +11,11 @@ #ifndef RAYCASTVEHICLE_H #define RAYCASTVEHICLE_H -#include "Dynamics/RigidBody.h" -#include "ConstraintSolver/TypedConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" struct MassProps; -#include "WheelInfo.h" +#include "btWheelInfo.h" struct VehicleRaycaster; class VehicleTuning; diff --git a/BulletDynamics/Vehicle/VehicleRaycaster.h b/src/BulletDynamics/Vehicle/btVehicleRaycaster.h similarity index 90% rename from BulletDynamics/Vehicle/VehicleRaycaster.h rename to src/BulletDynamics/Vehicle/btVehicleRaycaster.h index f3133c760..5abc5b9fb 100644 --- a/BulletDynamics/Vehicle/VehicleRaycaster.h +++ b/src/BulletDynamics/Vehicle/btVehicleRaycaster.h @@ -11,11 +11,14 @@ #ifndef VEHICLE_RAYCASTER_H #define VEHICLE_RAYCASTER_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" /// VehicleRaycaster is provides interface for between vehicle simulation and raycasting struct VehicleRaycaster { +virtual ~VehicleRaycaster() +{ +} struct VehicleRaycasterResult { VehicleRaycasterResult() :m_distFraction(-1.f){}; diff --git a/BulletDynamics/Vehicle/WheelInfo.cpp b/src/BulletDynamics/Vehicle/btWheelInfo.cpp similarity index 91% rename from BulletDynamics/Vehicle/WheelInfo.cpp rename to src/BulletDynamics/Vehicle/btWheelInfo.cpp index fcc82ea97..1a99b4d34 100644 --- a/BulletDynamics/Vehicle/WheelInfo.cpp +++ b/src/BulletDynamics/Vehicle/btWheelInfo.cpp @@ -8,8 +8,8 @@ * of this software for any purpose. * It is provided "as is" without express or implied warranty. */ -#include "WheelInfo.h" -#include "Dynamics/RigidBody.h" // for pointvelocity +#include "btWheelInfo.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" // for pointvelocity SimdScalar WheelInfo::GetSuspensionRestLength() const diff --git a/BulletDynamics/Vehicle/WheelInfo.h b/src/BulletDynamics/Vehicle/btWheelInfo.h similarity index 94% rename from BulletDynamics/Vehicle/WheelInfo.h rename to src/BulletDynamics/Vehicle/btWheelInfo.h index 1a47a82b2..c1c43c92f 100644 --- a/BulletDynamics/Vehicle/WheelInfo.h +++ b/src/BulletDynamics/Vehicle/btWheelInfo.h @@ -11,8 +11,8 @@ #ifndef WHEEL_INFO_H #define WHEEL_INFO_H -#include "SimdVector3.h" -#include "SimdTransform.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdTransform.h" class RigidBody; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..0ae1a7ab6 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1 @@ +SUBDIRS( BulletCollision BulletDynamics LinearMath ) diff --git a/src/Jamfile b/src/Jamfile new file mode 100644 index 000000000..742a9656e --- /dev/null +++ b/src/Jamfile @@ -0,0 +1,6 @@ +SubDir TOP src ; + +SubInclude TOP src BulletCollision ; +SubInclude TOP src BulletDynamics ; +SubInclude TOP src LinearMath ; + diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt new file mode 100644 index 000000000..85d435f84 --- /dev/null +++ b/src/LinearMath/CMakeLists.txt @@ -0,0 +1,9 @@ + +INCLUDE_DIRECTORIES( +${BULLET_PHYSICS_SOURCE_DIR}/src } +) + +ADD_LIBRARY(LibLinearMath +GenQuickprof.cpp +) + diff --git a/LinearMath/AabbUtil2.h b/src/LinearMath/GenAabbUtil2.h similarity index 98% rename from LinearMath/AabbUtil2.h rename to src/LinearMath/GenAabbUtil2.h index dab39b8a4..4937e760a 100644 --- a/LinearMath/AabbUtil2.h +++ b/src/LinearMath/GenAabbUtil2.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef AABB_UTIL2 #define AABB_UTIL2 -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" #define SimdMin(a,b) ((a < b ? a : b)) #define SimdMax(a,b) ((a > b ? a : b)) diff --git a/LinearMath/IDebugDraw.h b/src/LinearMath/GenIDebugDraw.h similarity index 98% rename from LinearMath/IDebugDraw.h rename to src/LinearMath/GenIDebugDraw.h index be6c3fd4f..8e3e96a56 100644 --- a/LinearMath/IDebugDraw.h +++ b/src/LinearMath/GenIDebugDraw.h @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #ifndef IDEBUG_DRAW__H #define IDEBUG_DRAW__H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" class IDebugDraw diff --git a/LinearMath/GEN_List.h b/src/LinearMath/GenList.h similarity index 100% rename from LinearMath/GEN_List.h rename to src/LinearMath/GenList.h diff --git a/LinearMath/GEN_MinMax.h b/src/LinearMath/GenMinMax.h similarity index 100% rename from LinearMath/GEN_MinMax.h rename to src/LinearMath/GenMinMax.h diff --git a/LinearMath/quickprof.cpp b/src/LinearMath/GenQuickprof.cpp similarity index 98% rename from LinearMath/quickprof.cpp rename to src/LinearMath/GenQuickprof.cpp index cb98d713a..6ac0b6d26 100644 --- a/LinearMath/quickprof.cpp +++ b/src/LinearMath/GenQuickprof.cpp @@ -27,7 +27,7 @@ // Credits: The Clock class was inspired by the Timer classes in // Ogre (www.ogre3d.org). -#include "quickprof.h" +#include "LinearMath/GenQuickprof.h" #ifdef USE_QUICKPROF diff --git a/LinearMath/quickprof.h b/src/LinearMath/GenQuickprof.h similarity index 100% rename from LinearMath/quickprof.h rename to src/LinearMath/GenQuickprof.h diff --git a/LinearMath/GEN_random.h b/src/LinearMath/GenRandom.h similarity index 100% rename from LinearMath/GEN_random.h rename to src/LinearMath/GenRandom.h diff --git a/LinearMath/Jamfile b/src/LinearMath/Jamfile similarity index 82% rename from LinearMath/Jamfile rename to src/LinearMath/Jamfile index e22e9e556..ad948a8f1 100644 --- a/LinearMath/Jamfile +++ b/src/LinearMath/Jamfile @@ -1,4 +1,4 @@ -SubDir TOP LinearMath ; +SubDir TOP src LinearMath ; Description bulletmath : "Bullet Math Library" ; diff --git a/LinearMath/SimdMatrix3x3.h b/src/LinearMath/SimdMatrix3x3.h similarity index 99% rename from LinearMath/SimdMatrix3x3.h rename to src/LinearMath/SimdMatrix3x3.h index a6f5bb434..11efb8998 100644 --- a/LinearMath/SimdMatrix3x3.h +++ b/src/LinearMath/SimdMatrix3x3.h @@ -16,10 +16,10 @@ subject to the following restrictions: #ifndef SimdMatrix3x3_H #define SimdMatrix3x3_H -#include "SimdScalar.h" +#include "LinearMath/SimdScalar.h" -#include "SimdVector3.h" -#include "SimdQuaternion.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdQuaternion.h" class SimdMatrix3x3 { diff --git a/LinearMath/SimdMinMax.h b/src/LinearMath/SimdMinMax.h similarity index 100% rename from LinearMath/SimdMinMax.h rename to src/LinearMath/SimdMinMax.h diff --git a/LinearMath/SimdPoint3.h b/src/LinearMath/SimdPoint3.h similarity index 96% rename from LinearMath/SimdPoint3.h rename to src/LinearMath/SimdPoint3.h index 15fb376f2..058563ae2 100644 --- a/LinearMath/SimdPoint3.h +++ b/src/LinearMath/SimdPoint3.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef SimdPoint3_H #define SimdPoint3_H -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" typedef SimdVector3 SimdPoint3; diff --git a/LinearMath/SimdQuadWord.h b/src/LinearMath/SimdQuadWord.h similarity index 98% rename from LinearMath/SimdQuadWord.h rename to src/LinearMath/SimdQuadWord.h index 99768da58..12a91bd55 100644 --- a/LinearMath/SimdQuadWord.h +++ b/src/LinearMath/SimdQuadWord.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef SIMD_QUADWORD_H #define SIMD_QUADWORD_H -#include "SimdScalar.h" +#include "LinearMath/SimdScalar.h" diff --git a/LinearMath/SimdQuaternion.h b/src/LinearMath/SimdQuaternion.h similarity index 99% rename from LinearMath/SimdQuaternion.h rename to src/LinearMath/SimdQuaternion.h index 2d152268e..b10960951 100644 --- a/LinearMath/SimdQuaternion.h +++ b/src/LinearMath/SimdQuaternion.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef SIMD__QUATERNION_H_ #define SIMD__QUATERNION_H_ -#include "SimdVector3.h" +#include "LinearMath/SimdVector3.h" class SimdQuaternion : public SimdQuadWord { public: diff --git a/LinearMath/SimdScalar.h b/src/LinearMath/SimdScalar.h similarity index 100% rename from LinearMath/SimdScalar.h rename to src/LinearMath/SimdScalar.h diff --git a/LinearMath/SimdTransform.h b/src/LinearMath/SimdTransform.h similarity index 98% rename from LinearMath/SimdTransform.h rename to src/LinearMath/SimdTransform.h index 621dc854c..426bbadf0 100644 --- a/LinearMath/SimdTransform.h +++ b/src/LinearMath/SimdTransform.h @@ -17,8 +17,8 @@ subject to the following restrictions: #ifndef SimdTransform_H #define SimdTransform_H -#include "SimdVector3.h" -#include "SimdMatrix3x3.h" +#include "LinearMath/SimdVector3.h" +#include "LinearMath/SimdMatrix3x3.h" diff --git a/LinearMath/SimdTransformUtil.h b/src/LinearMath/SimdTransformUtil.h similarity index 99% rename from LinearMath/SimdTransformUtil.h rename to src/LinearMath/SimdTransformUtil.h index 6bc0d2973..6cd822fdf 100644 --- a/LinearMath/SimdTransformUtil.h +++ b/src/LinearMath/SimdTransformUtil.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef SIMD_TRANSFORM_UTIL_H #define SIMD_TRANSFORM_UTIL_H -#include "SimdTransform.h" +#include "LinearMath/SimdTransform.h" #define ANGULAR_MOTION_TRESHOLD 0.5f*SIMD_HALF_PI diff --git a/LinearMath/SimdVector3.h b/src/LinearMath/SimdVector3.h similarity index 100% rename from LinearMath/SimdVector3.h rename to src/LinearMath/SimdVector3.h diff --git a/src/btBulletCollisionCommon.h b/src/btBulletCollisionCommon.h new file mode 100644 index 000000000..3cc1ff064 --- /dev/null +++ b/src/btBulletCollisionCommon.h @@ -0,0 +1,58 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BULLET_COLLISION_COMMON_H +#define BULLET_COLLISION_COMMON_H + +///Common headerfile includes for Bullet Collision Detection + +///Bullet's CollisionWorld and CollisionObject definitions +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" + +///Collision Shapes +#include "BulletCollision/CollisionShapes/btBoxShape.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" +#include "BulletCollision/CollisionShapes/btCylinderShape.h" +#include "BulletCollision/CollisionShapes/btConeShape.h" +#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h" +#include "BulletCollision/CollisionShapes/btConvexHullShape.h" +#include "BulletCollision/CollisionShapes/btTriangleMesh.h" +#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" +#include "BulletCollision/CollisionShapes/btCompoundShape.h" +#include "BulletCollision/CollisionShapes/btTetrahedronShape.h" +#include "BulletCollision/CollisionShapes/btEmptyShape.h" +#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" + + +///Narrowphase Collision Detector +#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" + + +///Dispatching and generation of collision pairs (broadphase) +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" +#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h" + + +///Math library +#include "LinearMath/SimdQuaternion.h" +#include "LinearMath/SimdTransform.h" + + + +#endif //BULLET_COLLISION_COMMON_H \ No newline at end of file diff --git a/src/btBulletDynamicsCommon.h b/src/btBulletDynamicsCommon.h new file mode 100644 index 000000000..b9789bb76 --- /dev/null +++ b/src/btBulletDynamicsCommon.h @@ -0,0 +1,31 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BULLET_DYNAMICS_COMMON_H +#define BULLET_DYNAMICS_COMMON_H + +///Common headerfile includes for Bullet Dynamics, including Collision Detection +#include "btBulletCollisionCommon.h" + +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" +#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h" +#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" +///Vehicle simulation, with wheel contact simulated by raycasts +#include "BulletDynamics/Vehicle/btRaycastVehicle.h" + + + +#endif //BULLET_DYNAMICS_COMMON_H \ No newline at end of file