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

6
Extras/COLLADA_DOM/CMakeLists.txt
View File

@@ -206,4 +206,8 @@ ADD_LIBRARY(LibColladaDom
src/modules/LIBXMLPlugin/daeLIBXMLResolver.cpp
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)