diff --git a/Extras/BulletColladaConverter/ColladaConverter.cpp b/Extras/BulletColladaConverter/ColladaConverter.cpp index 5d741ca25..b01395610 100644 --- a/Extras/BulletColladaConverter/ColladaConverter.cpp +++ b/Extras/BulletColladaConverter/ColladaConverter.cpp @@ -46,7 +46,19 @@ subject to the following restrictions: #define snprintf _snprintf #endif - +#ifdef __CELLOS_LV2__ +//provide some dummy stubs for getcwd and getenv on PS3 +extern "C" { + int getcwd(char* dir, int maxlen) + { + return 0; + } + int getenv(int bla) + { + return 0; + } +} +#endif struct btRigidBodyInput diff --git a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp index 6f4627214..74a2cae46 100644 --- a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp +++ b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp @@ -779,7 +779,6 @@ static void setupLinearConstraintWorld (SpuSolverConstraint& constraint, const b - static int getConstraintSize (btTypedConstraintType type) { switch (type) diff --git a/Extras/LibXML/config-ps3.h b/Extras/LibXML/config-ps3.h index bb78f328b..2181cec9c 100644 --- a/Extras/LibXML/config-ps3.h +++ b/Extras/LibXML/config-ps3.h @@ -149,7 +149,7 @@ /* #undef HAVE_SIGNAL */ /* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 +//#define HAVE_SIGNAL_H 0 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 diff --git a/Extras/LibXML/config.h b/Extras/LibXML/config.h index fb5761d31..3c4dea1fd 100644 --- a/Extras/LibXML/config.h +++ b/Extras/LibXML/config.h @@ -147,10 +147,10 @@ /* #undef HAVE_SHLLOAD */ /* Define to 1 if you have the `signal' function. */ -#define HAVE_SIGNAL 1 +//#define HAVE_SIGNAL 1 /* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 +//#define HAVE_SIGNAL_H 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 diff --git a/Extras/LibXML/config2.h b/Extras/LibXML/config2.h index 2febfcde3..17b141ac8 100644 --- a/Extras/LibXML/config2.h +++ b/Extras/LibXML/config2.h @@ -147,10 +147,10 @@ /* #undef HAVE_SHLLOAD */ /* Define to 1 if you have the `signal' function. */ -#define HAVE_SIGNAL 1 +//#define HAVE_SIGNAL 1 /* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 +//#define HAVE_SIGNAL_H 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp index 31e485e50..7c2ecd609 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp @@ -407,8 +407,6 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt btVoronoiSimplexSolver simplexSolver; btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver; - bool result = false; - btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver); //btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver); //btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver); diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index 130321be6..d624c810f 100644 --- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -245,7 +245,6 @@ btScalar resolveSingleCollisionCombinedCacheFriendly( (void)solverInfo; btScalar normalImpulse; - bool useSplitImpulse = false; {