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

Applied Cmakelist patch, adding Apple Framework support

Browse Source 
Disable libxml LIBXML_MODULE_EXTENSION
Fixed include path in btConeTwistConstraint (it should be relative to src folder, not using ../../ )
Thanks to ejtttje, http://code.google.com/p/bullet/issues/detail?id=129
This commit is contained in:
erwin.coumans
2008-11-06 06:02:38 +00:00
parent 8318005e75
commit 108c88af41
13 changed files with 304 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/CMakeLists.txt
View File

@@ -28,3 +28,7 @@ ADD_LIBRARY(LibOpenGLSupport
RenderTexture.cpp
DemoApplication.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibOpenGLSupport LibBulletDynamics LibBulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF (BUILD_SHARED_LIBS)

4
Extras/BulletColladaConverter/CMakeLists.txt
View File

@@ -6,3 +6,7 @@ ADD_LIBRARY(LibBulletColladaConverter
ColladaConverter.h
ColladaConverter.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletColladaConverter LibColladaDom LibBulletCollision LibBulletDynamics)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/COLLADA_DOM/CMakeLists.txt
View File

@@ -207,3 +207,7 @@ ADD_LIBRARY(LibColladaDom
src/modules/stdErrPlugin/stdErrPlugin.cpp
src/modules/STLDatabase/daeSTLDatabase.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibColladaDom LibXML)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/ConvexDecomposition/CMakeLists.txt
View File

@@ -9,3 +9,7 @@ ConvexBuilder.h bestfit.cpp cd_hull.cpp cd_wavefront.h fitsphere.h meshvolu
ConvexDecomposition.cpp bestfit.h cd_hull.h concavity.cpp float_math.cpp planetri.cpp splitplane.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibConvexDecomposition LibBulletCollision LibLinearMath)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/GIMPACTUtils/CMakeLists.txt
View File

@@ -8,3 +8,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
ADD_LIBRARY(LibGIMPACTUtils
btGImpactConvexDecompositionShape.cpp btGImpactConvexDecompositionShape.h
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibGIMPACTUtils LibConvexDecomposition LibBulletCollision)
ENDIF (BUILD_SHARED_LIBS)

2
Extras/LibXML/include/libxml/xmlversion.h
View File

@@ -362,7 +362,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* Whether the module interfaces are compiled in
*/
#if 1
#if 0
#define LIBXML_MODULES_ENABLED
/**
* LIBXML_MODULE_EXTENSION:

4
Extras/glui/CMakeLists.txt
View File

@@ -60,3 +60,7 @@ algebra3.h glui_bitmaps.cpp glui_edittext.cpp glui_mouse_iaction.cpp glui_s
arcball.cpp glui_button.cpp glui_filebrowser.cpp glui_node.cpp glui_separator.cpp glui_tree.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibGLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF (BUILD_SHARED_LIBS)

58
src/BulletCollision/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src }
)
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
SET(LibBulletCollision_SRCS
BroadphaseCollision/btAxisSweep3.cpp
@@ -89,8 +87,12 @@ SET(LibBulletCollision_SRCS
NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
)
SET(LibBulletCollision_HDRS
SET(Root_HDRS
../btBulletCollisionCommon.h
)
SET(BroadphaseCollision_HDRS
BroadphaseCollision/btAxisSweep3.h
BroadphaseCollision/btBroadphaseInterface.h
BroadphaseCollision/btBroadphaseProxy.h
BroadphaseCollision/btCollisionAlgorithm.h
BroadphaseCollision/btDispatcher.h
@@ -101,6 +103,10 @@ SET(LibBulletCollision_HDRS
BroadphaseCollision/btOverlappingPairCallback.h
BroadphaseCollision/btQuantizedBvh.h
BroadphaseCollision/btSimpleBroadphase.h
)
SET(CollisionDispatch_HDRS
CollisionDispatch/btCollisionConfiguration.h
CollisionDispatch/btCollisionCreateFunc.h
CollisionDispatch/btCollisionDispatcher.h
CollisionDispatch/btCollisionObject.h
CollisionDispatch/btCollisionWorld.h
@@ -120,9 +126,12 @@ SET(LibBulletCollision_HDRS
CollisionDispatch/btSimulationIslandManager.h
CollisionDispatch/btUnionFind.h
CollisionDispatch/SphereTriangleDetector.h
)
SET(CollisionShapes_HDRS
CollisionShapes/btBoxShape.h
CollisionShapes/btBvhTriangleMeshShape.h
CollisionShapes/btCapsuleShape.h
CollisionShapes/btCollisionMargin
CollisionShapes/btCollisionShape.h
CollisionShapes/btCompoundShape.h
CollisionShapes/btConcaveShape.h
@@ -154,6 +163,8 @@ SET(LibBulletCollision_HDRS
CollisionShapes/btTriangleMesh.h
CollisionShapes/btTriangleMeshShape.h
CollisionShapes/btUniformScalingShape.h
)
SET(Gimpact_HDRS
Gimpact/btGImpactShape.h
Gimpact/gim_contact.h
Gimpact/btGImpactBvh.h
@@ -164,31 +175,58 @@ SET(LibBulletCollision_HDRS
Gimpact/gim_tri_collision.h
Gimpact/btGImpactQuantizedBvh.h
Gimpact/gim_box_set.h
)
SET(NarrowPhaseCollision_HDRS
NarrowPhaseCollision/btContinuousConvexCollision.h
NarrowPhaseCollision/btContinuousConvexCollision.h
NarrowPhaseCollision/btConvexCast.h
NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
NarrowPhaseCollision/btGjkConvexCast.h
NarrowPhaseCollision/btGjkEpa2.h
NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
NarrowPhaseCollision/btConvexCast.h
NarrowPhaseCollision/btGjkConvexCast.h
NarrowPhaseCollision/btGjkPairDetector.h
NarrowPhaseCollision/btManifoldPoint.h
NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
NarrowPhaseCollision/btPersistentManifold.h
NarrowPhaseCollision/btPointCollector.h
NarrowPhaseCollision/btRaycastCallback.h
NarrowPhaseCollision/btSimplexSolverInterface.h
NarrowPhaseCollision/btSubSimplexConvexCast.h
NarrowPhaseCollision/btVoronoiSimplexSolver.h
)
SET(LibBulletCollision_HDRS
${Root_HDRS}
${BroadphaseCollision_HDRS}
${CollisionDispatch_HDRS}
${CollisionShapes_HDRS}
${Gimpact_HDRS}
${NarrowPhaseCollision_HDRS}
)
#ADD_LIBRARY(LibBulletCollision SHARED ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
#TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath)
ADD_LIBRARY(LibBulletCollision ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath)
ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
#INSTALL_TARGETS(DESTINATION LibBulletCollision)
#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletCollision_HDRS})
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
# Have to list out sub-directories manually:
SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

44
src/BulletDynamics/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src }
)
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
SET(LibBulletDynamics_SRCS
ConstraintSolver/btContactConstraint.cpp
@@ -20,31 +18,65 @@ SET(LibBulletDynamics_SRCS
Vehicle/btWheelInfo.cpp
)
SET(LibBulletDynamics_HDRS
SET(Root_HDRS
../btBulletDynamicsCommon.h
../btBulletCollisionCommon.h
)
SET(ConstraintSolver_HDRS
ConstraintSolver/btConstraintSolver.h
ConstraintSolver/btContactConstraint.h
ConstraintSolver/btContactSolverInfo.h
ConstraintSolver/btConeTwistConstraint.h
ConstraintSolver/btGeneric6DofConstraint.h
ConstraintSolver/btHingeConstraint.h
ConstraintSolver/btJacobianEntry.h
ConstraintSolver/btPoint2PointConstraint.h
ConstraintSolver/btSequentialImpulseConstraintSolver.h
ConstraintSolver/btSliderConstraint.h
ConstraintSolver/btSolve2LinearConstraint.h
ConstraintSolver/btSolverBody.h
ConstraintSolver/btSolverConstraint.h
ConstraintSolver/btTypedConstraint.h
)
SET(Dynamics_HDRS
Dynamics/btContinuousDynamicsWorld.h
Dynamics/btDiscreteDynamicsWorld.h
Dynamics/btDynamicsWorld.h
Dynamics/btSimpleDynamicsWorld.h
Dynamics/btRigidBody.h
)
SET(Vehicle_HDRS
Vehicle/btRaycastVehicle.h
Vehicle/btVehicleRaycaster.h
Vehicle/btWheelInfo.h
)
SET(LibBulletDynamics_HDRS
${Root_HDRS}
${ConstraintSolver_HDRS}
${Dynamics_HDRS}
${Vehicle_HDRS}
)
#ADD_LIBRARY(LibBulletDynamics SHARED ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
#TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath)
ADD_LIBRARY(LibBulletDynamics ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath)
ENDIF (BUILD_SHARED_LIBS)
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
#INSTALL(TARGETS LibBulletDynamics DESTINATION lib)
#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
# Have to list out sub-directories manually:
SET_PROPERTY(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
SET_PROPERTY(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
SET_PROPERTY(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

2
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
View File

@@ -20,7 +20,7 @@ Written by: Marcus Hennix
#ifndef CONETWISTCONSTRAINT_H
#define CONETWISTCONSTRAINT_H
#include "../../LinearMath/btVector3.h"
#include "LinearMath/btVector3.h"
#include "btJacobianEntry.h"
#include "btTypedConstraint.h"

7
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp
)
ADD_LIBRARY(LibBulletMultiThreaded
@@ -66,3 +67,7 @@ ADD_LIBRARY(LibBulletMultiThreaded
SpuRaycastTask/SpuSubSimplexConvexCast.cpp
SpuRaycastTask/SpuSubSimplexConvexCast.h
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletMultiThreaded LibBulletCollision)
ENDIF (BUILD_SHARED_LIBS)

8
src/BulletSoftBody/CMakeLists.txt
View File

@@ -27,8 +27,16 @@ SET(LibBulletSoftBody_HDRS
#ADD_LIBRARY(LibBulletSoftBody SHARED ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
ADD_LIBRARY(LibBulletSoftBody ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletSoftBody LibBulletDynamics)
ENDIF (BUILD_SHARED_LIBS)
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
INSTALL(TARGETS LibBulletSoftBody DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletSoftBody_HDRS})
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES PUBLIC_HEADER "${LibBulletSoftBody_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

5
src/LinearMath/CMakeLists.txt
View File

@@ -44,3 +44,8 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
INSTALL(TARGETS LibLinearMath DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES PUBLIC_HEADER "${LibLinearMath_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)