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

fixes for buildsystem

Browse Source
This commit is contained in:
ejcoumans
2006-12-09 01:19:15 +00:00
parent f9832f6b88
commit 9022f8cc70
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/Jamfile
View File

@@ -3,8 +3,6 @@ SubDir TOP Demos OpenGL ;
if $(GLUT.AVAILABLE) = "yes" if $(GLUT.AVAILABLE) = "yes"
{ {
IncludeDir Extras/PhysicsInterface/Common ;
IncludeDir Extras/PhysicsInterface/CcdPhysics ;
Description bulletopenglsupport : "Bullet OpenGL support" ; Description bulletopenglsupport : "Bullet OpenGL support" ;
Library bulletopenglsupport : Library bulletopenglsupport :
@@ -12,8 +10,6 @@ IncludeDir Extras/PhysicsInterface/CcdPhysics ;
; ;
CFlags bulletopenglsupport : CFlags bulletopenglsupport :
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
; ;
LibDepends bulletopenglsupport : bulletdynamics ; LibDepends bulletopenglsupport : bulletdynamics ;

10
Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
View File

@@ -88,8 +88,8 @@ do { \
typedef btScalar dMatrix3[4*3]; typedef btScalar dMatrix3[4*3];
void dLineClosestApproach (const btVector3 pa, const btVector3 ua, void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
const btVector3 pb, const btVector3 ub, const btVector3& pb, const btVector3& ub,
btScalar *alpha, btScalar *beta) btScalar *alpha, btScalar *beta)
{ {
btVector3 p; btVector3 p;
@@ -253,9 +253,9 @@ void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[])
int dBoxBox2 (const btVector3 p1, const dMatrix3 R1, int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
const btVector3 side1, const btVector3 p2, const btVector3& side1, const btVector3& p2,
const dMatrix3 R2, const btVector3 side2, const dMatrix3 R2, const btVector3& side2,
btVector3& normal, btScalar *depth, int *return_code, btVector3& normal, btScalar *depth, int *return_code,
int maxc, dContactGeom *contact, int skip,btDiscreteCollisionDetectorInterface::Result& output) int maxc, dContactGeom *contact, int skip,btDiscreteCollisionDetectorInterface::Result& output)
{ {

6
Extras/GPUphysics/GPU_physics.h
View File

@@ -95,9 +95,11 @@
#include <GLUT/glut.h> #include <GLUT/glut.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
#else #else
#include <GL/glut.h>
#include <GL/gl.h>
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h>
#include <GL/glut.h>
#endif #endif
#ifdef DISABLE_GL_ERROR_CHECKS #ifdef DISABLE_GL_ERROR_CHECKS

3
Extras/GPUphysics/Jamfile
View File

@@ -12,8 +12,7 @@ if $(GLUT.AVAILABLE) = "yes"
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/PhysicsInterface/CcdPhysics" ;
"../../Extras/PhysicsInterface/Common" ;
ExternalLibs GPUphysics : GLUT ; ExternalLibs GPUphysics : GLUT ;
} }