diff --git a/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h index 1618ad9fd..0d8bca41c 100644 --- a/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h +++ b/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h @@ -44,7 +44,7 @@ struct btCollisionAlgorithmConstructionInfo btDispatcher* m_dispatcher1; btPersistentManifold* m_manifold; - int getDispatcherId(); +// int getDispatcherId(); }; @@ -59,7 +59,7 @@ protected: btDispatcher* m_dispatcher; protected: - int getDispatcherId(); +// int getDispatcherId(); public: diff --git a/src/BulletCollision/Gimpact/btGImpactBvh.h b/src/BulletCollision/Gimpact/btGImpactBvh.h index 2e452ae4c..6174ae97a 100644 --- a/src/BulletCollision/Gimpact/btGImpactBvh.h +++ b/src/BulletCollision/Gimpact/btGImpactBvh.h @@ -383,9 +383,9 @@ public: return m_box_tree.get_node_pointer(index); } - +#ifdef TRI_COLLISION_PROFILING static float getAverageTreeCollisionTime(); - +#endif //TRI_COLLISION_PROFILING static void find_collision(btGImpactBvh * boxset1, const btTransform & trans1, btGImpactBvh * boxset2, const btTransform & trans2, diff --git a/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h b/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h index 1b7f92e04..ae5d55ab7 100644 --- a/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h +++ b/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h @@ -222,13 +222,13 @@ public: //! Use this function for register the algorithm externally static void registerAlgorithm(btCollisionDispatcher * dispatcher); - +#ifdef TRI_COLLISION_PROFILING //! Gets the average time in miliseconds of tree collisions static float getAverageTreeCollisionTime(); //! Gets the average time in miliseconds of triangle collisions static float getAverageTriangleCollisionTime(); - +#endif //TRI_COLLISION_PROFILING //! Collides two gimpact shapes /*! diff --git a/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h b/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h index 25a039174..9c9907747 100644 --- a/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h +++ b/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h @@ -359,9 +359,9 @@ public: return m_box_tree.get_node_pointer(index); } - +#ifdef TRI_COLLISION_PROFILING static float getAverageTreeCollisionTime(); - +#endif //TRI_COLLISION_PROFILING static void find_collision(btGImpactQuantizedBvh * boxset1, const btTransform & trans1, btGImpactQuantizedBvh * boxset2, const btTransform & trans2, diff --git a/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/src/BulletDynamics/Vehicle/btRaycastVehicle.h index 5ce80f4d2..ac42f1313 100644 --- a/src/BulletDynamics/Vehicle/btRaycastVehicle.h +++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.h @@ -112,7 +112,7 @@ public: void updateWheelTransform( int wheelIndex, bool interpolatedTransform = true ); - void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth); +// void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth); btWheelInfo& addWheel( const btVector3& connectionPointCS0, const btVector3& wheelDirectionCS0,const btVector3& wheelAxleCS,btScalar suspensionRestLength,btScalar wheelRadius,const btVehicleTuning& tuning, bool isFrontWheel); diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt index 755f59cfc..d15c317f0 100644 --- a/src/BulletMultiThreaded/CMakeLists.txt +++ b/src/BulletMultiThreaded/CMakeLists.txt @@ -89,7 +89,7 @@ IF (INSTALL_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(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) diff --git a/src/BulletSoftBody/btSoftBodyHelpers.h b/src/BulletSoftBody/btSoftBodyHelpers.h index 9675d6765..49b1f0bbc 100644 --- a/src/BulletSoftBody/btSoftBodyHelpers.h +++ b/src/BulletSoftBody/btSoftBodyHelpers.h @@ -119,16 +119,16 @@ struct btSoftBodyHelpers /* Export TetGen compatible .smesh file */ - static void ExportAsSMeshFile( btSoftBody* psb, - const char* filename); +// static void ExportAsSMeshFile( btSoftBody* psb, +// const char* filename); /* Create from TetGen .ele, .face, .node files */ - static btSoftBody* CreateFromTetGenFile( btSoftBodyWorldInfo& worldInfo, - const char* ele, - const char* face, - const char* node, - bool bfacelinks, - bool btetralinks, - bool bfacesfromtetras); +// static btSoftBody* CreateFromTetGenFile( btSoftBodyWorldInfo& worldInfo, +// const char* ele, +// const char* face, +// const char* node, +// bool bfacelinks, +// bool btetralinks, +// bool bfacesfromtetras); /* Create from TetGen .ele, .face, .node data */ static btSoftBody* CreateFromTetGenData( btSoftBodyWorldInfo& worldInfo, const char* ele, diff --git a/src/MiniCL/CMakeLists.txt b/src/MiniCL/CMakeLists.txt index 225f00275..bfaaf6b71 100644 --- a/src/MiniCL/CMakeLists.txt +++ b/src/MiniCL/CMakeLists.txt @@ -32,7 +32,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS MiniCL DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS MiniCL DESTINATION lib) + INSTALL(TARGETS MiniCL DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)