Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved Bullet COLLADA Convert into Extras folder, instead of embedded in the ColladaDemo

Browse Source
This commit is contained in:
ejcoumans
2007-10-12 07:39:04 +00:00
parent ca24f9941e
commit b0627e30cf
8 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/ColladaDemo/CMakeLists.txt
View File

@@ -48,15 +48,14 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(ColladaDemo ADD_EXECUTABLE(ColladaDemo
ColladaDemo.cpp ColladaDemo.cpp
ColladaConverter.cpp
) )

4
Demos/ColladaDemo/Jamfile
View File

@@ -6,9 +6,10 @@ SubDir TOP Demos ColladaDemo ;
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : colladadom libxml bulletopenglsupport bulletdynamics bulletcollision bulletmath ; LinkWith $(<) : BulletColladaConverter colladadom libxml bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/BulletColladaConverter ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
[ FIncludes $(TOP)/Extras/LibXML ] [ FIncludes $(TOP)/Extras/LibXML ]
@@ -19,6 +20,7 @@ SubDir TOP Demos ColladaDemo ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/BulletColladaConverter"
"../../Extras/COLLADA_DOM/include" "../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4" "../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML" "../../Extras/LibXML"

7
Extras/BulletColladaConverter/CMakeLists.txt Normal file
View File

@@ -0,0 +1,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4
)
ADD_LIBRARY(LibBulletColladaConverter
ColladaConverter.cpp
)

0
Demos/ColladaDemo/ColladaConverter.cpp → Extras/BulletColladaConverter/ColladaConverter.cpp
View File

0
Demos/ColladaDemo/ColladaConverter.h → Extras/BulletColladaConverter/ColladaConverter.h
View File

19
Extras/BulletColladaConverter/Jamfile Normal file
View File

@@ -0,0 +1,19 @@
SubDir TOP Extras BulletColladaConverter ;
#IncludeDir Extras/BulletColladaConverter ;
Library BulletColladaConverter : [ Wildcard . : */.h *.cpp ] : noinstall ;
CFlags BulletColladaConverter : [ FIncludes $(TOP)/Extras/BulletColladaConverter ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/LibXML ] [ FIncludes $(TOP)/Extras/LibXML/include ] ;
LibDepends BulletColladaConverter : colladadom libxml ;
MsvcIncDirs BulletColladaConverter :
"../../Extras/BulletColladaConverter"
"../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML"
"../../Extras/LibXML/include"
;
InstallHeader [ Wildcard *.h ] : BulletColladaConverter ;

2
Extras/CMakeLists.txt
View File

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

1
Extras/Jamfile
View File

@@ -3,6 +3,7 @@ SubDir TOP Extras ;
SubInclude TOP Extras ConvexDecomposition ; SubInclude TOP Extras ConvexDecomposition ;
SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;
SubInclude TOP Extras BulletColladaConverter ;
SubInclude TOP Extras BulletMultiThreaded ; SubInclude TOP Extras BulletMultiThreaded ;
#SubInclude TOP Extras EPA ; #SubInclude TOP Extras EPA ;
#SubInclude TOP Extras ExtraSolid35 ; #SubInclude TOP Extras ExtraSolid35 ;