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

updated CMake support: remove Lib prefix, to facilitate Apple Framework support, add App prefix for demos

Browse Source 
See discussion here: http://code.google.com/p/bullet/issues/detail?id=129
This commit is contained in:
erwin.coumans
2008-11-06 06:54:35 +00:00
parent 108c88af41
commit 2daf428386
33 changed files with 88 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/AllBulletDemos/CMakeLists.txt
View File

@@ -17,12 +17,12 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOUR
)
LINK_LIBRARIES(
LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
BulletColladaConverter GLUI GIMPACTUtils ConvexDecomposition ColladaDom XML OpenGLSupport BulletSoftBody BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(AllBulletDemos
ADD_EXECUTABLE(AppAllBulletDemos
Main.cpp
DemoEntries.cpp
../CcdPhysicsDemo/CcdPhysicsDemo.cpp

4
Demos/BasicDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(BasicDemo
ADD_EXECUTABLE(AppBasicDemo
main.cpp
BasicDemo.cpp
)

4
Demos/Benchmarks/CMakeLists.txt
View File

@@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(Benchmarks
ADD_EXECUTABLE(AppBenchmarks
main.cpp
BenchmarkDemo.cpp
)

4
Demos/BspDemo/CMakeLists.txt
View File

@@ -14,10 +14,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(BspPhysicsDemo
ADD_EXECUTABLE(AppBspPhysicsDemo
main.cpp
BspDemo.cpp
BspLoader.cpp

4
Demos/CcdPhysicsDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(CcdPhysicsDemo
ADD_EXECUTABLE(AppCcdPhysicsDemo
main.cpp
CcdPhysicsDemo.cpp
)

4
Demos/CharacterDemo/CMakeLists.txt
View File

@@ -14,10 +14,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(CharacterDemo
ADD_EXECUTABLE(AppCharacterDemo
KinematicCharacterController.cpp
DynamicCharacterController.cpp
KinematicCharacterController.h

4
Demos/ColladaDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOU
)
LINK_LIBRARIES(
LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
BulletColladaConverter ColladaDom XML OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(ColladaDemo
ADD_EXECUTABLE(AppColladaDemo
ColladaDemo.cpp
)

4
Demos/ConstraintDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(ConstraintDemo
ADD_EXECUTABLE(AppConstraintDemo
ConstraintDemo.cpp
main.cpp
)

4
Demos/ConvexDecompositionDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BUL
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath LibConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(ConvexDecompositionDemo
ADD_EXECUTABLE(AppConvexDecompositionDemo
main.cpp
ConvexDecompositionDemo.cpp
)

4
Demos/ForkLiftDemo/CMakeLists.txt
View File

@@ -52,10 +52,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
)
ADD_EXECUTABLE(ForkLiftDemo
ADD_EXECUTABLE(AppForkLiftDemo
ForkLiftDemo.cpp
main.cpp
)

4
Demos/GenericJointDemo/CMakeLists.txt
View File

@@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(GenericJointDemo
ADD_EXECUTABLE(AppGenericJointDemo
GenericJointDemo.cpp
Ragdoll.cpp
)

4
Demos/HelloWorld/CMakeLists.txt
View File

@@ -5,10 +5,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src }
)
LINK_LIBRARIES(
LibBulletDynamics LibBulletCollision LibLinearMath
BulletDynamics BulletCollision LinearMath
)
ADD_EXECUTABLE(HelloWorld
ADD_EXECUTABLE(AppHelloWorld
HelloWorld.cpp
)

4
Demos/MovingConcaveDemo/CMakeLists.txt
View File

@@ -52,10 +52,10 @@ INCLUDE_DIRECTORIES(
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(MovingConcaveDemo
ADD_EXECUTABLE(AppMovingConcaveDemo
ConcavePhysicsDemo.cpp
)

6
Demos/MultiThreadedDemo/CMakeLists.txt
View File

@@ -15,15 +15,15 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletMultiThreaded BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(MultiThreadedDemo
ADD_EXECUTABLE(AppMultiThreadedDemo
main.cpp
MultiThreadedDemo.cpp
MultiThreadedDemo.h
)
IF (UNIX)
TARGET_LINK_LIBRARIES(MultiThreadedDemo pthread)
TARGET_LINK_LIBRARIES(AppMultiThreadedDemo pthread)
ENDIF(UNIX)

4
Demos/OpenGL/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull }
)
ADD_LIBRARY(LibOpenGLSupport
ADD_LIBRARY(OpenGLSupport
BMF_Api.cpp
BMF_BitmapFont.cpp
BMF_font_helv10.cpp
@@ -30,5 +30,5 @@ ADD_LIBRARY(LibOpenGLSupport
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibOpenGLSupport LibBulletDynamics LibBulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF (BUILD_SHARED_LIBS)

4
Demos/RagdollDemo/CMakeLists.txt
View File

@@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(RagdollDemo
ADD_EXECUTABLE(AppRagdollDemo
RagdollDemo.cpp
main.cpp
)

4
Demos/SliderConstraintDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(SliderConstraintDemo
ADD_EXECUTABLE(AppSliderConstraintDemo
SliderConstraintDemo.cpp
main.cpp
)

4
Demos/SoftDemo/CMakeLists.txt
View File

@@ -17,10 +17,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletSoftBody BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(SoftBodyDemo
ADD_EXECUTABLE(AppSoftBodyDemo
main.cpp
SoftDemo.cpp
)

4
Demos/UserCollisionAlgorithm/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(UserCollisionAlgorithm
ADD_EXECUTABLE(AppUserCollisionAlgorithm
UserCollisionAlgorithm.cpp
)

4
Demos/VehicleDemo/CMakeLists.txt
View File

@@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
)
LINK_LIBRARIES(
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(VehicleDemo
ADD_EXECUTABLE(AppVehicleDemo
VehicleDemo.cpp
main.cpp
)

4
Extras/BulletColladaConverter/CMakeLists.txt
View File

@@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull ${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
ADD_LIBRARY(BulletColladaConverter
ColladaConverter.h
ColladaConverter.cpp
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletColladaConverter LibColladaDom LibBulletCollision LibBulletDynamics)
TARGET_LINK_LIBRARIES(BulletColladaConverter ColladaDom BulletCollision BulletDynamics)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/COLLADA_DOM/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE)
ADD_LIBRARY(LibColladaDom
ADD_LIBRARY(ColladaDom
src/1.4/dom/domAccessor.cpp
src/1.4/dom/domAnimation.cpp
src/1.4/dom/domAnimation_clip.cpp
@@ -209,5 +209,5 @@ ADD_LIBRARY(LibColladaDom
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibColladaDom LibXML)
TARGET_LINK_LIBRARIES(ColladaDom XML)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/ConvexDecomposition/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/src
)
ADD_LIBRARY(LibConvexDecomposition
ADD_LIBRARY(ConvexDecomposition
ConvexDecomposition.h bestfitobb.cpp cd_vector.h concavity.h float_math.h planetri.h splitplane.h
ConvexBuilder.cpp bestfitobb.h cd_wavefront.cpp fitsphere.cpp meshvolume.cpp raytri.cpp vlookup.cpp
ConvexBuilder.h bestfit.cpp cd_hull.cpp cd_wavefront.h fitsphere.h meshvolume.h raytri.h vlookup.h
@@ -11,5 +11,5 @@ ConvexDecomposition.cpp bestfit.h cd_hull.h concavity.cpp float_math.cpp pla
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibConvexDecomposition LibBulletCollision LibLinearMath)
TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/GIMPACTUtils/CMakeLists.txt
View File

@@ -5,10 +5,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils
${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
)
ADD_LIBRARY(LibGIMPACTUtils
ADD_LIBRARY(GIMPACTUtils
btGImpactConvexDecompositionShape.cpp btGImpactConvexDecompositionShape.h
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibGIMPACTUtils LibConvexDecomposition LibBulletCollision)
TARGET_LINK_LIBRARIES(GIMPACTUtils ConvexDecomposition BulletCollision)
ENDIF (BUILD_SHARED_LIBS)

4
Extras/LibXML/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE)
ADD_LIBRARY(LibXML
ADD_LIBRARY(XML
c14n.c
catalog.c
chvalid.c
@@ -55,4 +55,4 @@ ADD_LIBRARY(LibXML
xmlwriter.c
xpath.c
xpointer.c
)
)

4
Extras/glui/CMakeLists.txt
View File

@@ -51,7 +51,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/glui }
)
ADD_LIBRARY(LibGLUI
ADD_LIBRARY(GLUI
arcball.h glui_checkbox.cpp glui_internal.h glui_panel.cpp glui_spinner.cpp glui_treepanel.cpp
GL glui.cpp glui_column.cpp glui_internal_control.h glui_radio.cpp glui_statictext.cpp glui_window.cpp
Jamfile glui_add_controls.cpp glui_commandline.cpp glui_list.cpp glui_rollout.cpp glui_string.cpp quaternion.cpp
@@ -62,5 +62,5 @@ arcball.cpp glui_button.cpp glui_filebrowser.cpp glui_node.cpp glui_separ
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibGLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF (BUILD_SHARED_LIBS)

2
Extras/iff/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/iff
)
ADD_LIBRARY(LibIff
ADD_LIBRARY(Iff
iff.h
iffr.cpp
iffw.cpp

18
src/BulletCollision/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
SET(LibBulletCollision_SRCS
SET(BulletCollision_SRCS
BroadphaseCollision/btAxisSweep3.cpp
BroadphaseCollision/btBroadphaseProxy.cpp
BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -195,7 +195,7 @@ SET(NarrowPhaseCollision_HDRS
NarrowPhaseCollision/btVoronoiSimplexSolver.h
)
SET(LibBulletCollision_HDRS
SET(BulletCollision_HDRS
${Root_HDRS}
${BroadphaseCollision_HDRS}
${CollisionDispatch_HDRS}
@@ -205,23 +205,21 @@ SET(LibBulletCollision_HDRS
)
#ADD_LIBRARY(LibBulletCollision SHARED ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
ADD_LIBRARY(LibBulletCollision ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath)
TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
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})
INSTALL(TARGETS BulletCollision 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(LibBulletCollision PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
SET_TARGET_PROPERTIES(BulletCollision 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)

17
src/BulletDynamics/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
SET(LibBulletDynamics_SRCS
SET(BulletDynamics_SRCS
ConstraintSolver/btContactConstraint.cpp
ConstraintSolver/btConeTwistConstraint.cpp
ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -51,29 +51,28 @@ SET(Vehicle_HDRS
Vehicle/btWheelInfo.h
)
SET(LibBulletDynamics_HDRS
SET(BulletDynamics_HDRS
${Root_HDRS}
${ConstraintSolver_HDRS}
${Dynamics_HDRS}
${Vehicle_HDRS}
)
#ADD_LIBRARY(LibBulletDynamics SHARED ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
ADD_LIBRARY(LibBulletDynamics ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath)
TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
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")
INSTALL(TARGETS BulletDynamics 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(BulletDynamics PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
SET_TARGET_PROPERTIES(BulletDynamics 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)

4
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp
)
ADD_LIBRARY(LibBulletMultiThreaded
ADD_LIBRARY(BulletMultiThreaded
PlatformDefinitions.h
SpuFakeDma.cpp
SpuFakeDma.h
@@ -69,5 +69,5 @@ ADD_LIBRARY(LibBulletMultiThreaded
)
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletMultiThreaded LibBulletCollision)
TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletCollision)
ENDIF (BUILD_SHARED_LIBS)

18
src/BulletSoftBody/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src }
)
SET(LibBulletSoftBody_SRCS
SET(BulletSoftBody_SRCS
btSoftBody.cpp
btSoftBodyHelpers.cpp
btSoftBodyRigidBodyCollisionConfiguration.cpp
@@ -13,7 +13,7 @@ SET(LibBulletSoftBody_SRCS
btSoftRigidDynamicsWorld.cpp
)
SET(LibBulletSoftBody_HDRS
SET(BulletSoftBody_HDRS
btSoftBody.h
btSparseSDF.h
btSoftBodyHelpers.h
@@ -25,18 +25,18 @@ SET(LibBulletSoftBody_HDRS
#ADD_LIBRARY(LibBulletSoftBody SHARED ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
ADD_LIBRARY(LibBulletSoftBody ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
#ADD_LIBRARY(BulletSoftBody SHARED ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
ADD_LIBRARY(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(LibBulletSoftBody LibBulletDynamics)
TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics)
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})
INSTALL(TARGETS BulletSoftBody DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${BulletSoftBody_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}")
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

2
src/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ else (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics LinearMath )
endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
#INSTALL of other files requires CMake 2.6^M
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h Bullet-C-Api.h DESTINATION include)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)

14
src/LinearMath/CMakeLists.txt
View File

@@ -3,14 +3,14 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src }
)
SET(LibLinearMath_SRCS
SET(LinearMath_SRCS
btConvexHull.cpp
btQuickprof.cpp
btGeometryUtil.cpp
btAlignedAllocator.cpp
)
SET(LibLinearMath_HDRS
SET(LinearMath_HDRS
btAlignedObjectArray.h
btList.h
btPoolAllocator.h
@@ -35,17 +35,15 @@ SET(LibLinearMath_HDRS
btTransformUtil.h
)
# ADD_LIBRARY(LibLinearMath SHARED ${LibLinearMath_SRCS} ${LibLinearMath_HDRS})
ADD_LIBRARY(LibLinearMath ${LibLinearMath_SRCS} ${LibLinearMath_HDRS})
ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
#FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
INSTALL(TARGETS LibLinearMath DESTINATION lib)
INSTALL(TARGETS LinearMath 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}")
SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)