diff options
Diffstat (limited to 'sci-physics/bullet/files')
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-gcc46.patch | 47 | ||||
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-libdir.patch | 24 | ||||
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-soversion.patch | 36 |
3 files changed, 0 insertions, 107 deletions
diff --git a/sci-physics/bullet/files/bullet-2.77-gcc46.patch b/sci-physics/bullet/files/bullet-2.77-gcc46.patch deleted file mode 100644 index 9ef054836e33..000000000000 --- a/sci-physics/bullet/files/bullet-2.77-gcc46.patch +++ /dev/null @@ -1,47 +0,0 @@ - src/BulletSoftBody/btSoftBody.h | 3 +++ - src/BulletSoftBody/btSoftBodyInternals.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h -index 4d975b7..f781598 100644 ---- a/src/BulletSoftBody/btSoftBody.h -+++ b/src/BulletSoftBody/btSoftBody.h -@@ -30,6 +30,7 @@ subject to the following restrictions: - class btBroadphaseInterface; - class btDispatcher; - -+class btSoftBodySolver; - - /* btSoftBodyWorldInfo */ - struct btSoftBodyWorldInfo -@@ -52,6 +53,8 @@ class btSoftBody : public btCollisionObject - public: - btAlignedObjectArray<class btCollisionObject*> m_collisionDisabledObjects; - -+ // The solver object that handles this soft body -+ btSoftBodySolver *m_softBodySolver; - // - // Enumerations - // -diff --git a/src/BulletSoftBody/btSoftBodyInternals.h b/src/BulletSoftBody/btSoftBodyInternals.h -index 2cb7744..296d97a 100644 ---- a/src/BulletSoftBody/btSoftBodyInternals.h -+++ b/src/BulletSoftBody/btSoftBodyInternals.h -@@ -26,6 +26,7 @@ subject to the following restrictions: - #include "BulletCollision/CollisionShapes/btConvexInternalShape.h" - #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" - -+#include <string.h> //for memset - // - // btSymMatrix - // -@@ -172,8 +173,7 @@ public: - template <typename T> - static inline void ZeroInitialize(T& value) - { -- static const T zerodummy; -- value=zerodummy; -+ memset(&value,0,sizeof(T)); - } - // - template <typename T> diff --git a/sci-physics/bullet/files/bullet-2.77-libdir.patch b/sci-physics/bullet/files/bullet-2.77-libdir.patch deleted file mode 100644 index 9575addbb58c..000000000000 --- a/sci-physics/bullet/files/bullet-2.77-libdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt ---- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib 2010-10-08 12:45:59.000000000 +0200 -+++ bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-10-08 12:46:26.000000000 +0200 -@@ -84,7 +84,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 -up bullet-2.77/src/MiniCL/CMakeLists.txt.lib bullet-2.77/src/MiniCL/CMakeLists.txt ---- bullet-2.77/src/MiniCL/CMakeLists.txt.lib 2010-10-08 12:44:50.000000000 +0200 -+++ bullet-2.77/src/MiniCL/CMakeLists.txt 2010-10-08 12:46:42.000000000 +0200 -@@ -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)
diff --git a/sci-physics/bullet/files/bullet-2.77-soversion.patch b/sci-physics/bullet/files/bullet-2.77-soversion.patch deleted file mode 100644 index 6086640790ac..000000000000 --- a/sci-physics/bullet/files/bullet-2.77-soversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up bullet-2.77/Extras/glui/CMakeLists.txt.extras-version bullet-2.77/Extras/glui/CMakeLists.txt ---- bullet-2.77/Extras/glui/CMakeLists.txt.extras-version 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.77/Extras/glui/CMakeLists.txt 2010-07-26 12:09:01.000000000 +0200 -@@ -61,6 +61,8 @@ arcball.cpp glui_button.cpp glui_fil - - ) - -+SET_TARGET_PROPERTIES(GLUI PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(GLUI PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) - ENDIF (BUILD_SHARED_LIBS) -diff -up bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt ---- bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version 2010-07-26 12:10:36.000000000 +0200 -+++ bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2010-07-26 12:10:57.000000000 +0200 -@@ -16,6 +16,8 @@ btBulletFile.cpp - btBulletFile.h - ) - -+SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) - ENDIF (BUILD_SHARED_LIBS) -diff -up bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ---- bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version 2010-07-26 12:11:08.000000000 +0200 -+++ bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2010-07-26 12:11:26.000000000 +0200 -@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp - btBulletWorldImporter.h - ) - -+SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) - ENDIF (BUILD_SHARED_LIBS) |