From 133a7dda9907afb15aeba098d9993284c0eea4cb Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 12 Nov 2006 07:56:16 +0000
Subject: [PATCH] updated CMakefiles and stuff

---
 Extras/CMakeLists.txt               |  2 +-
 Extras/GIMPACT/CMakeLists.txt       | 19 +++++++++++++++++++
 Extras/GIMPACT/Jamfile              |  4 ++--
 Extras/GIMPACT/src/gim_memory.cpp   |  2 +-
 Extras/GIMPACTBullet/CMakeLists.txt |  8 ++++++++
 Extras/GIMPACTBullet/Jamfile        |  3 ++-
 Extras/Jamfile                      |  4 ++--
 7 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 Extras/GIMPACT/CMakeLists.txt
 create mode 100644 Extras/GIMPACTBullet/CMakeLists.txt

diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index be3bf071c..a4570883d 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS( LibXML COLLADA_DOM )
+SUBDIRS( LibXML COLLADA_DOM GIMPACT GIMPACTBullet )
diff --git a/Extras/GIMPACT/CMakeLists.txt b/Extras/GIMPACT/CMakeLists.txt
new file mode 100644
index 000000000..b2c6e6c83
--- /dev/null
+++ b/Extras/GIMPACT/CMakeLists.txt
@@ -0,0 +1,19 @@
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include
+)
+
+ADD_LIBRARY(LibGIMPACT
+		src/gim_boxpruning.cpp
+		src/gim_contact.cpp
+		src/gim_math.cpp
+		src/gim_memory.cpp
+		src/gim_tri_tri_overlap.cpp
+		src/gim_trimesh.cpp
+		src/gim_trimesh_capsule_collision.cpp
+		src/gim_trimesh_data.cpp
+		src/gim_trimesh_ray_collision.cpp
+		src/gim_trimesh_sphere_collision.cpp
+		src/gim_trimesh_trimesh_collision.cpp
+		src/gim_vertex_buffer_util.cpp
+		src/gimpact.cpp
+)
diff --git a/Extras/GIMPACT/Jamfile b/Extras/GIMPACT/Jamfile
index 062b9eb1a..688faf168 100644
--- a/Extras/GIMPACT/Jamfile
+++ b/Extras/GIMPACT/Jamfile
@@ -1,8 +1,8 @@
 SubDir TOP Extras GIMPACT ;
 
-IncludeDir Extras/GIMPACT ;
+IncludeDir Extras/GIMPACT/include ;
 
-Library GIMPACT : [ Wildcard *.h *.cpp ] ;
+Library GIMPACT : [ Wildcard src : */.h *.cpp ] ;
 CFlags GIMPACT : [ FIncludes $(TOP)/Extras/GIMPACT/include ] ;
 LibDepends GIMPACT :  ;
 
diff --git a/Extras/GIMPACT/src/gim_memory.cpp b/Extras/GIMPACT/src/gim_memory.cpp
index a273d1b5b..9b1a0b28c 100644
--- a/Extras/GIMPACT/src/gim_memory.cpp
+++ b/Extras/GIMPACT/src/gim_memory.cpp
@@ -31,7 +31,7 @@ email: projectileman@yahoo.com
 
 #include "GIMPACT/gim_memory.h"
 #include "stdlib.h"
-#include "malloc.h"
+//#include "malloc.h"
 //#include "mm_malloc.h"
 
 static gim_alloc_function *g_allocfn = 0;
diff --git a/Extras/GIMPACTBullet/CMakeLists.txt b/Extras/GIMPACTBullet/CMakeLists.txt
new file mode 100644
index 000000000..aaf0fc58b
--- /dev/null
+++ b/Extras/GIMPACTBullet/CMakeLists.txt
@@ -0,0 +1,8 @@
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTBullet
+)
+
+ADD_LIBRARY(LibGIMPACTBullet
+		btConcaveConcaveCollisionAlgorithm.cpp
+		btGIMPACTMeshShape.cpp
+)
diff --git a/Extras/GIMPACTBullet/Jamfile b/Extras/GIMPACTBullet/Jamfile
index ea4c58e07..e40137f42 100644
--- a/Extras/GIMPACTBullet/Jamfile
+++ b/Extras/GIMPACTBullet/Jamfile
@@ -1,9 +1,10 @@
 SubDir TOP Extras GIMPACTBullet ;
 
 IncludeDir Extras/GIMPACTBullet ;
+IncludeDir Extras/GIMPACT/include ;
 
 Library GIMPACTBullet : [ Wildcard *.h *.cpp ] ;
-CFlags GIMPACTBullet : [ FIncludes $(TOP)/Extras/GIMPACTBullet ] ;
+CFlags GIMPACTBullet : [ FIncludes $(TOP)/Extras/GIMPACTBullet $(TOP)/Extras/GIMPACT/include ] ;
 LibDepends GIMPACTBullet : GIMPACT  ;
 
 
diff --git a/Extras/Jamfile b/Extras/Jamfile
index 61d95c4b6..b6ee37e13 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -6,6 +6,6 @@ SubInclude TOP Extras LibXML ;
 #SubInclude TOP Extras EPA ;
 #SubInclude TOP Extras ExtraSolid35 ;
 #SubInclude TOP Extras quickstep ;
-#SubInclude TOP Extras GIMPACT ;
-#SubInclude TOP Extras GIMPACTBullet ;
+SubInclude TOP Extras GIMPACT ;
+SubInclude TOP Extras GIMPACTBullet ;
 #SubInclude TOP Extras GPUphysics ;