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

Added option to install 'Extra' libs, turned off by default (BulletMultiThreaded, OpenGL, COLLADA_DOM, libxml,BulletColladaConverter)

Browse Source 
Thanks xenonofarcticus, for the patch: http://code.google.com/p/bullet/issues/detail?id=294
This commit is contained in:
erwin.coumans
2009-12-13 20:30:29 +00:00
parent 0a6f7b271d
commit 6536d8cc31
9 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -69,4 +69,9 @@ IF(BUILD_EXTRAS)
SUBDIRS(Extras) SUBDIRS(Extras)
ENDIF(BUILD_EXTRAS) ENDIF(BUILD_EXTRAS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" OFF)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
SUBDIRS(src) SUBDIRS(src)

2
Demos/BasicDemo/BasicDemo.cpp
View File

@@ -174,7 +174,7 @@ void BasicDemo::initPhysics()
btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform); btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform);
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia); btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo); btRigidBody* body = new btRigidBody(rbInfo);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
body->setActivationState(ISLAND_SLEEPING); body->setActivationState(ISLAND_SLEEPING);
m_dynamicsWorld->addRigidBody(body); m_dynamicsWorld->addRigidBody(body);

12
Demos/OpenGL/CMakeLists.txt
View File

@@ -33,3 +33,15 @@ ADD_LIBRARY(OpenGLSupport
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${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) ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS OpenGLSupport DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS OpenGLSupport DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

3
Demos/OpenGL/GL_DialogDynamicsWorld.cpp
View File

@@ -200,7 +200,6 @@ GL_DialogWindow* GL_DialogDynamicsWorld::createDialog(int horPos,int vertPos,int
body->setWorldTransform(trans); body->setWorldTransform(trans);
body->setDamping(0.999,0.99); body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING); //body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0)); body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1)); //body->setAngularFactor(btVector3(0,0,1));
@@ -229,7 +228,6 @@ GL_SliderControl* GL_DialogDynamicsWorld::createSlider(GL_DialogWindow* dialog,
body->setWorldTransform(trans); body->setWorldTransform(trans);
//body->setDamping(0.999,0.99); //body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING); //body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0)); body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1)); //body->setAngularFactor(btVector3(0,0,1));
@@ -292,7 +290,6 @@ GL_ToggleControl* GL_DialogDynamicsWorld::createToggle(GL_DialogWindow* dialog,
body->setWorldTransform(trans); body->setWorldTransform(trans);
body->setDamping(0.999,0.99); body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING); //body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0)); body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1)); //body->setAngularFactor(btVector3(0,0,1));

5
Doxyfile
View File

@@ -718,6 +718,11 @@ MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES GENERATE_LEGEND = YES
# delete intermediate dot files?
DOT_CLEANUP = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration::addtions related to the search engine # Configuration::addtions related to the search engine
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

12
Extras/BulletColladaConverter/CMakeLists.txt
View File

@@ -10,3 +10,15 @@ ADD_LIBRARY(BulletColladaConverter
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletColladaConverter ColladaDom BulletCollision BulletDynamics) TARGET_LINK_LIBRARIES(BulletColladaConverter ColladaDom BulletCollision BulletDynamics)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletColladaConverter DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletColladaConverter DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

14
Extras/COLLADA_DOM/CMakeLists.txt
View File

@@ -211,3 +211,17 @@ ADD_LIBRARY(ColladaDom
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(ColladaDom XML) TARGET_LINK_LIBRARIES(ColladaDom XML)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS ColladaDom DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS ColladaDom DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION include/1.4 FILES_MATCHING PATTERN "*.h")
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/dae DESTINATION include/dae FILES_MATCHING PATTERN "*.h")
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/modules DESTINATION include/modules FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

13
Extras/LibXML/CMakeLists.txt
View File

@@ -55,3 +55,16 @@ ADD_LIBRARY(XML
xpath.c xpath.c
xpointer.c xpointer.c
) )
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS XML DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS XML DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/libxml DESTINATION include/libxml FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

12
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -69,3 +69,15 @@ ADD_LIBRARY(BulletMultiThreaded
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletCollision) TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletCollision)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletMultiThreaded DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletMultiThreaded DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)