updated CMakeLists.txt to include LibXML and LibColladaDom, and use better naming for libs. This should allow autogeneration of visual studio projectfiles, and Apple XCode projectfiles for COLLADA_DOM demo.

This commit is contained in:
ejcoumans
2006-08-28 01:26:31 +00:00
parent ee3ca06b20
commit 4cdcee8871
13 changed files with 334 additions and 12 deletions

View File

@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet }
) )
ADD_LIBRARY(BULLET_COLLISION ADD_LIBRARY(LibBulletCollision
BroadphaseCollision/AxisSweep3.cpp BroadphaseCollision/AxisSweep3.cpp
BroadphaseCollision/BroadphaseProxy.cpp BroadphaseCollision/BroadphaseProxy.cpp
BroadphaseCollision/CollisionAlgorithm.cpp BroadphaseCollision/CollisionAlgorithm.cpp

View File

@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics } ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics }
) )
ADD_LIBRARY(BULLET_DYNAMICS ADD_LIBRARY(LibBulletDynamics
ConstraintSolver/ContactConstraint.cpp ConstraintSolver/ContactConstraint.cpp
ConstraintSolver/Generic6DofConstraint.cpp ConstraintSolver/Generic6DofConstraint.cpp

View File

@@ -52,10 +52,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BU
) )
LINK_LIBRARIES( LINK_LIBRARIES(
CCD_PHYSICS_INTERFACE OPENGL_SUPPORT BULLET_DYNAMICS PHYSICS_COMMON_INTERFACE BULLET_COLLISION LINEAR_MATH ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
) )
ADD_EXECUTABLE(BSP_PHYSICS_DEMO ADD_EXECUTABLE(BspPhysicsDemo
BspDemo.cpp BspDemo.cpp
BspLoader.cpp BspLoader.cpp
BspConverter.cpp BspConverter.cpp

View File

@@ -1,2 +1,2 @@
SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ) SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ColladaDemo )

View File

@@ -52,10 +52,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BU
) )
LINK_LIBRARIES( LINK_LIBRARIES(
CCD_PHYSICS_INTERFACE OPENGL_SUPPORT BULLET_DYNAMICS PHYSICS_COMMON_INTERFACE BULLET_COLLISION LINEAR_MATH ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
) )
ADD_EXECUTABLE(CCD_PHYSICS_DEMO ADD_EXECUTABLE(CcdPhysicsDemo
CcdPhysicsDemo.cpp CcdPhysicsDemo.cpp
MyMotionState.cpp MyMotionState.cpp
) )

View File

@@ -0,0 +1,61 @@
# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
# For every executable you have with a main method you should have an add_executable line below.
# For every add executable line you should list every .cpp and .h file you have associated with that executable.
# This is the variable for Windows. I use this to define the root of my directory structure.
SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
# You shouldn't have to modify anything below this line
########################################################
# This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system
# This should be the case.
INCLUDE (${CMAKE_ROOT}/Modules/FindGLU.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/FindGLUT.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
IF (WIN32)
# This is the Windows code for which Opengl, and Glut are not properly installed
# since I can't install them I must cheat and copy libraries around
INCLUDE_DIRECTORIES(${GLUT_ROOT})
# LINK_DIRECTORIES(${GLUT_ROOT}\\lib)
IF (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)
# LINK_LIBRARIES(${GLUT_ROOT}\\lib\\glut32 ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
# TARGET_LINK_LIBRARIES(table ${GLUT_ROOT}\\lib\\glut32)
#
# ADD_CUSTOM_COMMAND(TARGET table POST_BUILD COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2005\\Debug
# COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2003\\Debug
# COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs6\\Debug)
ELSE (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
# LINK_LIBRARIES(${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
# TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY})
ENDIF(${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
# TARGET_LINK_LIBRARIES(table ${OPENGL_gl_LIBRARY})
# TARGET_LINK_LIBRARIES(table ${OPENGL_glu_LIBRARY})
ELSE (WIN32)
# This is the lines for linux. This should always work if everything is installed and working fine.
# SET(CMAKE_BUILD_TYPE Debug)
# SET(CMAKE_CXX_FLAGS_DEBUG "-g")
INCLUDE_DIRECTORIES(/usr/include /usr/local/include ${GLUT_INCLUDE_DIR})
# TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
# TARGET_LINK_LIBRARIES(checker ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
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}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
)
LINK_LIBRARIES(
LibColladaDom LibXML LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
)
ADD_EXECUTABLE(ColladaDemo
ColladaDemo.cpp
)

View File

@@ -50,7 +50,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet }
) )
ADD_LIBRARY(OPENGL_SUPPORT ADD_LIBRARY(LibOpenGLSupport
BMF_Api.cpp BMF_Api.cpp
BMF_BitmapFont.cpp BMF_BitmapFont.cpp
BMF_font_helv10.cpp BMF_font_helv10.cpp

View File

@@ -1 +1 @@
SUBDIRS( PhysicsInterface ) SUBDIRS( PhysicsInterface LibXML COLLADA_DOM )

View File

@@ -0,0 +1,205 @@
INCLUDE_DIRECTORIES(
${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(LibColladaDom
src/1.4/dom/domAccessor.cpp
src/1.4/dom/domAnimation.cpp
src/1.4/dom/domAnimation_clip.cpp
src/1.4/dom/domAsset.cpp
src/1.4/dom/domBind_material.cpp
src/1.4/dom/domBool_array.cpp
src/1.4/dom/domBox.cpp
src/1.4/dom/domCamera.cpp
src/1.4/dom/domCapsule.cpp
src/1.4/dom/domCg_connect_param.cpp
src/1.4/dom/domCg_newarray_type.cpp
src/1.4/dom/domCg_newparam.cpp
src/1.4/dom/domCg_param_type.cpp
src/1.4/dom/domCg_sampler1D.cpp
src/1.4/dom/domCg_sampler2D.cpp
src/1.4/dom/domCg_sampler3D.cpp
src/1.4/dom/domCg_samplerCUBE.cpp
src/1.4/dom/domCg_samplerDEPTH.cpp
src/1.4/dom/domCg_samplerRECT.cpp
src/1.4/dom/domCg_setarray_type.cpp
src/1.4/dom/domCg_setparam.cpp
src/1.4/dom/domCg_setparam_simple.cpp
src/1.4/dom/domCg_setuser_type.cpp
src/1.4/dom/domCg_surface_type.cpp
src/1.4/dom/domChannel.cpp
src/1.4/dom/domCOLLADA.cpp
src/1.4/dom/domCommon_color_or_texture_type.cpp
src/1.4/dom/domCommon_float_or_param_type.cpp
src/1.4/dom/domCommon_newparam_type.cpp
src/1.4/dom/domCommon_transparent_type.cpp
src/1.4/dom/domConstants.cpp
src/1.4/dom/domController.cpp
src/1.4/dom/domConvex_mesh.cpp
src/1.4/dom/domCylinder.cpp
src/1.4/dom/domEffect.cpp
src/1.4/dom/domEllipsoid.cpp
src/1.4/dom/domExtra.cpp
src/1.4/dom/domFloat_array.cpp
src/1.4/dom/domForce_field.cpp
src/1.4/dom/domFx_annotate_common.cpp
src/1.4/dom/domFx_annotate_type_common.cpp
src/1.4/dom/domFx_basic_type_common.cpp
src/1.4/dom/domFx_clearcolor_common.cpp
src/1.4/dom/domFx_cleardepth_common.cpp
src/1.4/dom/domFx_clearstencil_common.cpp
src/1.4/dom/domFx_code_profile.cpp
src/1.4/dom/domFx_colortarget_common.cpp
src/1.4/dom/domFx_depthtarget_common.cpp
src/1.4/dom/domFx_include_common.cpp
src/1.4/dom/domFx_newparam_common.cpp
src/1.4/dom/domFx_profile_abstract.cpp
src/1.4/dom/domFx_sampler1D_common.cpp
src/1.4/dom/domFx_sampler2D_common.cpp
src/1.4/dom/domFx_sampler3D_common.cpp
src/1.4/dom/domFx_samplerCUBE_common.cpp
src/1.4/dom/domFx_samplerDEPTH_common.cpp
src/1.4/dom/domFx_samplerRECT_common.cpp
src/1.4/dom/domFx_stenciltarget_common.cpp
src/1.4/dom/domFx_surface_common.cpp
src/1.4/dom/domFx_surface_format_hint_common.cpp
src/1.4/dom/domFx_surface_init_common.cpp
src/1.4/dom/domFx_surface_init_cube_common.cpp
src/1.4/dom/domFx_surface_init_from_common.cpp
src/1.4/dom/domFx_surface_init_planar_common.cpp
src/1.4/dom/domFx_surface_init_volume_common.cpp
src/1.4/dom/domGeometry.cpp
src/1.4/dom/domGl_hook_abstract.cpp
src/1.4/dom/domGl_pipeline_settings.cpp
src/1.4/dom/domGl_sampler1D.cpp
src/1.4/dom/domGl_sampler2D.cpp
src/1.4/dom/domGl_sampler3D.cpp
src/1.4/dom/domGl_samplerCUBE.cpp
src/1.4/dom/domGl_samplerDEPTH.cpp
src/1.4/dom/domGl_samplerRECT.cpp
src/1.4/dom/domGles_basic_type_common.cpp
src/1.4/dom/domGles_newparam.cpp
src/1.4/dom/domGles_pipeline_settings.cpp
src/1.4/dom/domGles_sampler_state.cpp
src/1.4/dom/domGles_texcombiner_argumentAlpha_type.cpp
src/1.4/dom/domGles_texcombiner_argumentRGB_type.cpp
src/1.4/dom/domGles_texcombiner_command_type.cpp
src/1.4/dom/domGles_texcombiner_commandAlpha_type.cpp
src/1.4/dom/domGles_texcombiner_commandRGB_type.cpp
src/1.4/dom/domGles_texenv_command_type.cpp
src/1.4/dom/domGles_texture_constant_type.cpp
src/1.4/dom/domGles_texture_pipeline.cpp
src/1.4/dom/domGles_texture_unit.cpp
src/1.4/dom/domGlsl_newarray_type.cpp
src/1.4/dom/domGlsl_newparam.cpp
src/1.4/dom/domGlsl_param_type.cpp
src/1.4/dom/domGlsl_setarray_type.cpp
src/1.4/dom/domGlsl_setparam.cpp
src/1.4/dom/domGlsl_setparam_simple.cpp
src/1.4/dom/domGlsl_surface_type.cpp
src/1.4/dom/domIDREF_array.cpp
src/1.4/dom/domImage.cpp
src/1.4/dom/domInputGlobal.cpp
src/1.4/dom/domInputLocal.cpp
src/1.4/dom/domInputLocalOffset.cpp
src/1.4/dom/domInstance_camera.cpp
src/1.4/dom/domInstance_controller.cpp
src/1.4/dom/domInstance_effect.cpp
src/1.4/dom/domInstance_force_field.cpp
src/1.4/dom/domInstance_geometry.cpp
src/1.4/dom/domInstance_light.cpp
src/1.4/dom/domInstance_material.cpp
src/1.4/dom/domInstance_node.cpp
src/1.4/dom/domInstance_physics_material.cpp
src/1.4/dom/domInstance_physics_model.cpp
src/1.4/dom/domInstance_rigid_body.cpp
src/1.4/dom/domInstance_rigid_constraint.cpp
src/1.4/dom/domInstanceWithExtra.cpp
src/1.4/dom/domInt_array.cpp
src/1.4/dom/domLibrary_animation_clips.cpp
src/1.4/dom/domLibrary_animations.cpp
src/1.4/dom/domLibrary_cameras.cpp
src/1.4/dom/domLibrary_controllers.cpp
src/1.4/dom/domLibrary_effects.cpp
src/1.4/dom/domLibrary_force_fields.cpp
src/1.4/dom/domLibrary_geometries.cpp
src/1.4/dom/domLibrary_images.cpp
src/1.4/dom/domLibrary_lights.cpp
src/1.4/dom/domLibrary_materials.cpp
src/1.4/dom/domLibrary_nodes.cpp
src/1.4/dom/domLibrary_physics_materials.cpp
src/1.4/dom/domLibrary_physics_models.cpp
src/1.4/dom/domLibrary_physics_scenes.cpp
src/1.4/dom/domLibrary_visual_scenes.cpp
src/1.4/dom/domLight.cpp
src/1.4/dom/domLines.cpp
src/1.4/dom/domLinestrips.cpp
src/1.4/dom/domLookat.cpp
src/1.4/dom/domMaterial.cpp
src/1.4/dom/domMatrix.cpp
src/1.4/dom/domMesh.cpp
src/1.4/dom/domMorph.cpp
src/1.4/dom/domName_array.cpp
src/1.4/dom/domNode.cpp
src/1.4/dom/domP.cpp
src/1.4/dom/domParam.cpp
src/1.4/dom/domPhysics_material.cpp
src/1.4/dom/domPhysics_model.cpp
src/1.4/dom/domPhysics_scene.cpp
src/1.4/dom/domPlane.cpp
src/1.4/dom/domPolygons.cpp
src/1.4/dom/domPolylist.cpp
src/1.4/dom/domProfile_CG.cpp
src/1.4/dom/domProfile_COMMON.cpp
src/1.4/dom/domProfile_GLES.cpp
src/1.4/dom/domProfile_GLSL.cpp
src/1.4/dom/domRigid_body.cpp
src/1.4/dom/domRigid_constraint.cpp
src/1.4/dom/domRotate.cpp
src/1.4/dom/domSampler.cpp
src/1.4/dom/domScale.cpp
src/1.4/dom/domSkew.cpp
src/1.4/dom/domSkin.cpp
src/1.4/dom/domSource.cpp
src/1.4/dom/domSphere.cpp
src/1.4/dom/domSpline.cpp
src/1.4/dom/domTapered_capsule.cpp
src/1.4/dom/domTapered_cylinder.cpp
src/1.4/dom/domTargetableFloat.cpp
src/1.4/dom/domTargetableFloat3.cpp
src/1.4/dom/domTechnique.cpp
src/1.4/dom/domTranslate.cpp
src/1.4/dom/domTriangles.cpp
src/1.4/dom/domTrifans.cpp
src/1.4/dom/domTristrips.cpp
src/1.4/dom/domTypes.cpp
src/1.4/dom/domVertices.cpp
src/1.4/dom/domVisual_scene.cpp
src/dae/dae.cpp
src/dae/daeArray.cpp
src/dae/daeAtomicType.cpp
src/dae/daeDocument.cpp
src/dae/daeDom.cpp
src/dae/daeElement.cpp
src/dae/daeError.cpp
src/dae/daeErrorHandler.cpp
src/dae/daeIDRef.cpp
src/dae/daeMemorySystem.cpp
src/dae/daeMetaAny.cpp
src/dae/daeMetaAttribute.cpp
src/dae/daeMetaChoice.cpp
src/dae/daeMetaCMPolicy.cpp
src/dae/daeMetaElement.cpp
src/dae/daeMetaElementAttribute.cpp
src/dae/daeMetaGroup.cpp
src/dae/daeMetaSequence.cpp
src/dae/daeSIDResolver.cpp
src/dae/daeStringRef.cpp
src/dae/daeStringTable.cpp
src/dae/daeURI.cpp
src/dae/domAny.cpp
src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
src/modules/LIBXMLPlugin/daeLIBXMLResolver.cpp
src/modules/stdErrPlugin/stdErrPlugin.cpp
src/modules/STLDatabase/daeSTLDatabase.cpp
)

View File

@@ -0,0 +1,56 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include }
)
ADD_LIBRARY(LibXML
c14n.c
catalog.c
chvalid.c
debugXML.c
dict.c
DOCBparser.c
encoding.c
entities.c
error.c
globals.c
hash.c
HTMLparser.c
HTMLtree.c
legacy.c
list.c
nanoftp.c
nanohttp.c
parser.c
parserInternals.c
pattern.c
relaxng.c
runsuite.c
runtest.c
SAX.c
SAX2.c
schematron.c
threads.c
tree.c
trio.c
trionan.c
triostr.c
uri.c
valid.c
xinclude.c
xlink.c
xmlcatalog.c
xmlIO.c
xmllint.c
xmlmemory.c
xmlmodule.c
xmlreader.c
xmlregexp.c
xmlsave.c
xmlschemas.c
xmlschemastypes.c
xmlstring.c
xmlunicode.c
xmlwriter.c
xpath.c
xpointer.c
)

View File

@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet ${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
) )
ADD_LIBRARY(CCD_PHYSICS_INTERFACE ADD_LIBRARY(LibCcdPhysicsInterface
CcdPhysicsController.cpp CcdPhysicsController.cpp
CcdPhysicsEnvironment.cpp CcdPhysicsEnvironment.cpp
ParallelIslandDispatcher.cpp ParallelIslandDispatcher.cpp

View File

@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common } ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common }
) )
ADD_LIBRARY(PHYSICS_COMMON_INTERFACE ADD_LIBRARY(LibPhysicsCommonInterface
PHY_IMotionState.cpp PHY_IMotionState.cpp
PHY_IPhysicsController.cpp PHY_IPhysicsController.cpp
PHY_IPhysicsEnvironment.cpp PHY_IPhysicsEnvironment.cpp

View File

@@ -1,4 +1,4 @@
ADD_LIBRARY(LINEAR_MATH ADD_LIBRARY(LibLinearMath
Geometry.cpp Geometry.cpp
Quat.cpp Quat.cpp
Vector.cpp Vector.cpp