From 9022f8cc70e8b753acb940fd2002b24f05e4be9e Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sat, 9 Dec 2006 01:19:15 +0000
Subject: [PATCH] fixes for buildsystem

---
 Demos/OpenGL/Jamfile                                   |  4 ----
 .../AlternativeCollisionAlgorithms/BoxBoxDetector.cpp  | 10 +++++-----
 Extras/GPUphysics/GPU_physics.h                        |  6 ++++--
 Extras/GPUphysics/Jamfile                              |  3 +--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Demos/OpenGL/Jamfile b/Demos/OpenGL/Jamfile
index c1189a7e4..abcb63cd1 100644
--- a/Demos/OpenGL/Jamfile
+++ b/Demos/OpenGL/Jamfile
@@ -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   ;
diff --git a/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp b/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
index 6df7ad22c..002690375 100644
--- a/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
+++ b/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
@@ -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)
 {
diff --git a/Extras/GPUphysics/GPU_physics.h b/Extras/GPUphysics/GPU_physics.h
index 55be86342..f13d3e334 100644
--- a/Extras/GPUphysics/GPU_physics.h
+++ b/Extras/GPUphysics/GPU_physics.h
@@ -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
diff --git a/Extras/GPUphysics/Jamfile b/Extras/GPUphysics/Jamfile
index f351be8e0..0f888c744 100644
--- a/Extras/GPUphysics/Jamfile
+++ b/Extras/GPUphysics/Jamfile
@@ -12,8 +12,7 @@ if $(GLUT.AVAILABLE) = "yes"
     ;
     MsvcIncDirs $(<) : 
 	"../../Demos/OpenGL" 
-	"../../Extras/PhysicsInterface/CcdPhysics" 
-	"../../Extras/PhysicsInterface/Common" ;
+	;
     
 	ExternalLibs GPUphysics : GLUT ;
   }