updated CMakefiles and stuff

This commit is contained in:
ejcoumans
2006-11-12 07:56:16 +00:00
parent 711b737293
commit 133a7dda99
7 changed files with 35 additions and 7 deletions

View File

@@ -1 +1 @@
SUBDIRS( LibXML COLLADA_DOM ) SUBDIRS( LibXML COLLADA_DOM GIMPACT GIMPACTBullet )

View File

@@ -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
)

View File

@@ -1,8 +1,8 @@
SubDir TOP Extras GIMPACT ; 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 ] ; CFlags GIMPACT : [ FIncludes $(TOP)/Extras/GIMPACT/include ] ;
LibDepends GIMPACT : ; LibDepends GIMPACT : ;

View File

@@ -31,7 +31,7 @@ email: projectileman@yahoo.com
#include "GIMPACT/gim_memory.h" #include "GIMPACT/gim_memory.h"
#include "stdlib.h" #include "stdlib.h"
#include "malloc.h" //#include "malloc.h"
//#include "mm_malloc.h" //#include "mm_malloc.h"
static gim_alloc_function *g_allocfn = 0; static gim_alloc_function *g_allocfn = 0;

View File

@@ -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
)

View File

@@ -1,9 +1,10 @@
SubDir TOP Extras GIMPACTBullet ; SubDir TOP Extras GIMPACTBullet ;
IncludeDir Extras/GIMPACTBullet ; IncludeDir Extras/GIMPACTBullet ;
IncludeDir Extras/GIMPACT/include ;
Library GIMPACTBullet : [ Wildcard *.h *.cpp ] ; Library GIMPACTBullet : [ Wildcard *.h *.cpp ] ;
CFlags GIMPACTBullet : [ FIncludes $(TOP)/Extras/GIMPACTBullet ] ; CFlags GIMPACTBullet : [ FIncludes $(TOP)/Extras/GIMPACTBullet $(TOP)/Extras/GIMPACT/include ] ;
LibDepends GIMPACTBullet : GIMPACT ; LibDepends GIMPACTBullet : GIMPACT ;

View File

@@ -6,6 +6,6 @@ SubInclude TOP Extras LibXML ;
#SubInclude TOP Extras EPA ; #SubInclude TOP Extras EPA ;
#SubInclude TOP Extras ExtraSolid35 ; #SubInclude TOP Extras ExtraSolid35 ;
#SubInclude TOP Extras quickstep ; #SubInclude TOP Extras quickstep ;
#SubInclude TOP Extras GIMPACT ; SubInclude TOP Extras GIMPACT ;
#SubInclude TOP Extras GIMPACTBullet ; SubInclude TOP Extras GIMPACTBullet ;
#SubInclude TOP Extras GPUphysics ; #SubInclude TOP Extras GPUphysics ;