From 39884e4665160a95411793bc70ae5cd2c0475413 Mon Sep 17 00:00:00 2001
From: erwin coumans <erwin.coumans@gmail.com>
Date: Wed, 20 Mar 2013 00:33:21 -0700
Subject: [PATCH] more compile fixes

---
 opencl/gpu_sat/test/premake4.lua            | 3 +++
 src/BulletGeometry/btConvexHull.cpp         | 6 +++---
 src/BulletGeometry/btConvexHull.h           | 4 ++--
 src/BulletGeometry/btGeometryUtil.h         | 4 ++--
 src/BulletGeometry/btPolarDecomposition.cpp | 2 +-
 src/BulletGeometry/btPolarDecomposition.h   | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/opencl/gpu_sat/test/premake4.lua b/opencl/gpu_sat/test/premake4.lua
index 58af3cdb9..551980e52 100644
--- a/opencl/gpu_sat/test/premake4.lua
+++ b/opencl/gpu_sat/test/premake4.lua
@@ -34,6 +34,9 @@ function createProject(vendor)
 			"../../../src/BulletCommon/btAlignedObjectArray.h",
 			"../../../src/BulletCommon/btQuickprof.cpp",
 			"../../../src/BulletCommon/btQuickprof.h",
+			"../../../src/BulletGeometry/**.cpp",
+			"../../../src/BulletGeometry/**.h",
+			
 
 		}
 		
diff --git a/src/BulletGeometry/btConvexHull.cpp b/src/BulletGeometry/btConvexHull.cpp
index 2ae855dbc..bd20db41f 100644
--- a/src/BulletGeometry/btConvexHull.cpp
+++ b/src/BulletGeometry/btConvexHull.cpp
@@ -16,9 +16,9 @@ subject to the following restrictions:
 #include <string.h>
 
 #include "btConvexHull.h"
-#include "btAlignedObjectArray.h"
-#include "btMinMax.h"
-#include "btVector3.h"
+#include "BulletCommon/btAlignedObjectArray.h"
+#include "BulletCommon/btMinMax.h"
+#include "BulletCommon/btVector3.h"
 
 
 
diff --git a/src/BulletGeometry/btConvexHull.h b/src/BulletGeometry/btConvexHull.h
index 69c52bc6f..4954058ad 100644
--- a/src/BulletGeometry/btConvexHull.h
+++ b/src/BulletGeometry/btConvexHull.h
@@ -19,8 +19,8 @@ subject to the following restrictions:
 #ifndef BT_CD_HULL_H
 #define BT_CD_HULL_H
 
-#include "btVector3.h"
-#include "btAlignedObjectArray.h"
+#include "BulletCommon/btVector3.h"
+#include "BulletCommon/btAlignedObjectArray.h"
 
 typedef btAlignedObjectArray<unsigned int> TUIntArray;
 
diff --git a/src/BulletGeometry/btGeometryUtil.h b/src/BulletGeometry/btGeometryUtil.h
index a4b13b456..96e3d46a0 100644
--- a/src/BulletGeometry/btGeometryUtil.h
+++ b/src/BulletGeometry/btGeometryUtil.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef BT_GEOMETRY_UTIL_H
 #define BT_GEOMETRY_UTIL_H
 
-#include "btVector3.h"
-#include "btAlignedObjectArray.h"
+#include "BulletCommon/btVector3.h"
+#include "BulletCommon/btAlignedObjectArray.h"
 
 ///The btGeometryUtil helper class provides a few methods to convert between plane equations and vertices.
 class btGeometryUtil
diff --git a/src/BulletGeometry/btPolarDecomposition.cpp b/src/BulletGeometry/btPolarDecomposition.cpp
index d7de20408..78328947f 100644
--- a/src/BulletGeometry/btPolarDecomposition.cpp
+++ b/src/BulletGeometry/btPolarDecomposition.cpp
@@ -1,5 +1,5 @@
 #include "btPolarDecomposition.h"
-#include "btMinMax.h"
+#include "BulletCommon/btMinMax.h"
 
 namespace
 {
diff --git a/src/BulletGeometry/btPolarDecomposition.h b/src/BulletGeometry/btPolarDecomposition.h
index 561566764..621c9d278 100644
--- a/src/BulletGeometry/btPolarDecomposition.h
+++ b/src/BulletGeometry/btPolarDecomposition.h
@@ -1,7 +1,7 @@
 #ifndef POLARDECOMPOSITION_H
 #define POLARDECOMPOSITION_H
 
-#include "btMatrix3x3.h"
+#include "BulletCommon/btMatrix3x3.h"
 
 /**
  * This class is used to compute the polar decomposition of a matrix. In