Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

+ add dummy getcwd/getenv for PS3 compatibility

Browse Source 
+ disable HAVE_SIGNAL_H 0 for LibXML
+ removed unused variable in btCollisionWorld
+ removed unused variable in btSequentialImpulseConstraintSolver
This commit is contained in:
erwin.coumans
2008-07-28 23:15:43 +00:00
parent 3ca977e39f
commit 9cd83c004b
7 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Extras/BulletColladaConverter/ColladaConverter.cpp
View File

@@ -46,7 +46,19 @@ subject to the following restrictions:
#define snprintf _snprintf #define snprintf _snprintf
#endif #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 struct btRigidBodyInput

1
Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
View File

@@ -779,7 +779,6 @@ static void setupLinearConstraintWorld (SpuSolverConstraint& constraint, const b
static int getConstraintSize (btTypedConstraintType type) static int getConstraintSize (btTypedConstraintType type)
{ {
switch (type) switch (type)

2
Extras/LibXML/config-ps3.h
View File

@@ -149,7 +149,7 @@
/* #undef HAVE_SIGNAL */ /* #undef HAVE_SIGNAL */
/* Define to 1 if you have the <signal.h> header file. */ /* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1 //#define HAVE_SIGNAL_H 0
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1

4
Extras/LibXML/config.h
View File

@@ -147,10 +147,10 @@
/* #undef HAVE_SHLLOAD */ /* #undef HAVE_SHLLOAD */
/* Define to 1 if you have the `signal' function. */ /* Define to 1 if you have the `signal' function. */
#define HAVE_SIGNAL 1 //#define HAVE_SIGNAL 1
/* Define to 1 if you have the <signal.h> header file. */ /* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1 //#define HAVE_SIGNAL_H 1
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1

4
Extras/LibXML/config2.h
View File

@@ -147,10 +147,10 @@
/* #undef HAVE_SHLLOAD */ /* #undef HAVE_SHLLOAD */
/* Define to 1 if you have the `signal' function. */ /* Define to 1 if you have the `signal' function. */
#define HAVE_SIGNAL 1 //#define HAVE_SIGNAL 1
/* Define to 1 if you have the <signal.h> header file. */ /* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1 //#define HAVE_SIGNAL_H 1
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1

2
src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
View File

@@ -407,8 +407,6 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
btVoronoiSimplexSolver simplexSolver; btVoronoiSimplexSolver simplexSolver;
btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver; btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver;
bool result = false;
btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver); btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver);
//btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver); //btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver);
//btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver); //btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver);

1
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -245,7 +245,6 @@ btScalar resolveSingleCollisionCombinedCacheFriendly(
(void)solverInfo; (void)solverInfo;
btScalar normalImpulse; btScalar normalImpulse;
bool useSplitImpulse = false;
{ {