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
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