AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-16 14:40:05 +00:00
Code Issues 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
Show Stats 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"
{
IncludeDir Extras/PhysicsInterface/Common ;
IncludeDir Extras/PhysicsInterface/CcdPhysics ;
Description bulletopenglsupport : "Bullet OpenGL support" ;
Library bulletopenglsupport :
@ -12,8 +10,6 @@ IncludeDir Extras/PhysicsInterface/CcdPhysics ;
;
CFlags bulletopenglsupport :
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
;
LibDepends bulletopenglsupport : bulletdynamics ;

10
Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
View File

@ -88,8 +88,8 @@ do { \
typedef btScalar dMatrix3[4*3];
void dLineClosestApproach (const btVector3 pa, const btVector3 ua,
const btVector3 pb, const btVector3 ub,
void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
const btVector3& pb, const btVector3& ub,
btScalar *alpha, btScalar *beta)
{
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,
const btVector3 side1, const btVector3 p2,
const dMatrix3 R2, const btVector3 side2,
int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
const btVector3& side1, const btVector3& p2,
const dMatrix3 R2, const btVector3& side2,
btVector3& normal, btScalar *depth, int *return_code,
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 <OpenGL/glext.h>
#else
#include <GL/glut.h>
#include <GL/gl.h>
#include <GL/glew.h>
#include <GL/gl.h>
#include <GL/glut.h>
#endif
#ifdef DISABLE_GL_ERROR_CHECKS

3
Extras/GPUphysics/Jamfile
View File

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