From b0627e30cf6621987e5dfe2b442ffaaa12d12180 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Fri, 12 Oct 2007 07:39:04 +0000 Subject: [PATCH] moved Bullet COLLADA Convert into Extras folder, instead of embedded in the ColladaDemo --- Demos/ColladaDemo/CMakeLists.txt | 5 ++--- Demos/ColladaDemo/Jamfile | 4 +++- Extras/BulletColladaConverter/CMakeLists.txt | 7 +++++++ .../ColladaConverter.cpp | 0 .../ColladaConverter.h | 0 Extras/BulletColladaConverter/Jamfile | 19 +++++++++++++++++++ Extras/CMakeLists.txt | 2 +- Extras/Jamfile | 1 + 8 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 Extras/BulletColladaConverter/CMakeLists.txt rename {Demos/ColladaDemo => Extras/BulletColladaConverter}/ColladaConverter.cpp (100%) rename {Demos/ColladaDemo => Extras/BulletColladaConverter}/ColladaConverter.h (100%) create mode 100644 Extras/BulletColladaConverter/Jamfile diff --git a/Demos/ColladaDemo/CMakeLists.txt b/Demos/ColladaDemo/CMakeLists.txt index 74cea020e..69a079814 100644 --- a/Demos/ColladaDemo/CMakeLists.txt +++ b/Demos/ColladaDemo/CMakeLists.txt @@ -48,15 +48,14 @@ ELSE (WIN32) ENDIF (WIN32) 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( -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 ColladaDemo.cpp - ColladaConverter.cpp ) diff --git a/Demos/ColladaDemo/Jamfile b/Demos/ColladaDemo/Jamfile index 323e46079..d88ed4f1f 100644 --- a/Demos/ColladaDemo/Jamfile +++ b/Demos/ColladaDemo/Jamfile @@ -6,9 +6,10 @@ SubDir TOP Demos ColladaDemo ; { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : colladadom libxml bulletopenglsupport bulletdynamics bulletcollision bulletmath ; + LinkWith $(<) : BulletColladaConverter colladadom libxml bulletopenglsupport bulletdynamics bulletcollision bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] + [ FIncludes $(TOP)/Extras/BulletColladaConverter ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/LibXML ] @@ -19,6 +20,7 @@ SubDir TOP Demos ColladaDemo ; MsvcIncDirs $(<) : "../../Demos/OpenGL" + "../../Extras/BulletColladaConverter" "../../Extras/COLLADA_DOM/include" "../../Extras/COLLADA_DOM/include/1.4" "../../Extras/LibXML" diff --git a/Extras/BulletColladaConverter/CMakeLists.txt b/Extras/BulletColladaConverter/CMakeLists.txt new file mode 100644 index 000000000..f19aa08e7 --- /dev/null +++ b/Extras/BulletColladaConverter/CMakeLists.txt @@ -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 +) diff --git a/Demos/ColladaDemo/ColladaConverter.cpp b/Extras/BulletColladaConverter/ColladaConverter.cpp similarity index 100% rename from Demos/ColladaDemo/ColladaConverter.cpp rename to Extras/BulletColladaConverter/ColladaConverter.cpp diff --git a/Demos/ColladaDemo/ColladaConverter.h b/Extras/BulletColladaConverter/ColladaConverter.h similarity index 100% rename from Demos/ColladaDemo/ColladaConverter.h rename to Extras/BulletColladaConverter/ColladaConverter.h diff --git a/Extras/BulletColladaConverter/Jamfile b/Extras/BulletColladaConverter/Jamfile new file mode 100644 index 000000000..f169bfc76 --- /dev/null +++ b/Extras/BulletColladaConverter/Jamfile @@ -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 ; diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt index b118f73b5..f48e3fba8 100644 --- a/Extras/CMakeLists.txt +++ b/Extras/CMakeLists.txt @@ -1 +1 @@ -SUBDIRS( LibXML COLLADA_DOM GIMPACT ) +SUBDIRS( BulletColladaConverter LibXML COLLADA_DOM GIMPACT ) diff --git a/Extras/Jamfile b/Extras/Jamfile index f1af1c116..8b24b18dd 100644 --- a/Extras/Jamfile +++ b/Extras/Jamfile @@ -3,6 +3,7 @@ SubDir TOP Extras ; SubInclude TOP Extras ConvexDecomposition ; SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras LibXML ; +SubInclude TOP Extras BulletColladaConverter ; SubInclude TOP Extras BulletMultiThreaded ; #SubInclude TOP Extras EPA ; #SubInclude TOP Extras ExtraSolid35 ;