Dirk Stoecker
a6d747b4d5
- Update to 3.17
* improvements for the finite-element-method (FEM) deformable simulation
* See the "Learning Agile Robotic Locomotion Skills by Imitating Animals"
paper for more detail about this release
- Update use-system-libs.patch for 3.17
- Compile with USE_DOUBLE_PRECISION
- Disable building BULLET_ROBOTICS and OBJ2SDF by cmake options instead
of removing them by sed
OBS-URL: https://build.opensuse.org/request/show/912567
OBS-URL: https://build.opensuse.org/package/show/games/libbullet?expand=0&rev=22
94 lines
3.9 KiB
Diff
94 lines
3.9 KiB
Diff
From f9163f939804871f8574ccd11cb16719726ef373 Mon Sep 17 00:00:00 2001
|
|
From: Adriankhl <dlshcbmuipmam@hotmail.com>
|
|
Date: Tue, 10 Aug 2021 14:37:36 +0800
|
|
Subject: [PATCH] Use system library
|
|
|
|
---
|
|
CMakeLists.txt | 2 ++
|
|
Extras/BulletRobotics/CMakeLists.txt | 5 ++---
|
|
Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt | 5 ++---
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a695b7172..e549616c2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -352,6 +352,8 @@ ENDIF(BUILD_PYBULLET)
|
|
OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON)
|
|
OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON)
|
|
|
|
+include(FindPkgConfig)
|
|
+pkg_check_modules(tinyxml2 REQUIRED tinyxml2)
|
|
|
|
IF(BUILD_PYBULLET)
|
|
FIND_PACKAGE(PythonLibs)
|
|
diff --git a/Extras/BulletRobotics/CMakeLists.txt b/Extras/BulletRobotics/CMakeLists.txt
|
|
index d2ab42334..442f003a5 100644
|
|
--- a/Extras/BulletRobotics/CMakeLists.txt
|
|
+++ b/Extras/BulletRobotics/CMakeLists.txt
|
|
@@ -1,5 +1,6 @@
|
|
|
|
INCLUDE_DIRECTORIES(
|
|
+ ${tinyxml2_INCLUDE_DIRS}
|
|
${BULLET_PHYSICS_SOURCE_DIR}/src
|
|
${BULLET_PHYSICS_SOURCE_DIR}/examples
|
|
${BULLET_PHYSICS_SOURCE_DIR}/examples/SharedMemory
|
|
@@ -63,7 +64,6 @@ SET(BulletRobotics_INCLUDES
|
|
../../examples/Utils/b3ERPCFMHelper.hpp
|
|
../../examples/Utils/b3ReferenceFrameHelper.hpp
|
|
|
|
- ../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.h
|
|
../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
|
|
../../examples/ThirdPartyLibs/stb_image/stb_image.h
|
|
../../examples/ThirdPartyLibs/BussIK/Jacobian.h
|
|
@@ -147,7 +147,6 @@ SET(BulletRobotics_SRCS ${BulletRobotics_INCLUDES}
|
|
../../examples/Utils/b3ResourcePath.cpp
|
|
../../examples/Utils/ChromeTraceUtil.cpp
|
|
|
|
- ../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp
|
|
../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
|
|
../../examples/ThirdPartyLibs/stb_image/stb_image.cpp
|
|
../../examples/ThirdPartyLibs/BussIK/Jacobian.cpp
|
|
@@ -282,7 +281,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION})
|
|
SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
|
|
|
|
IF (BUILD_SHARED_LIBS)
|
|
- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
|
+ TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common ${tinyxml2_LIBRARIES})
|
|
ENDIF (BUILD_SHARED_LIBS)
|
|
|
|
|
|
diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
|
index 9fd125e44..560ede3d4 100644
|
|
--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
|
+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
|
@@ -1,8 +1,8 @@
|
|
INCLUDE_DIRECTORIES(
|
|
+ ${tinyxml2_INCLUDE_DIRS}
|
|
${BULLET_PHYSICS_SOURCE_DIR}/src
|
|
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
|
|
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
|
|
- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2
|
|
)
|
|
|
|
ADD_LIBRARY(
|
|
@@ -11,14 +11,13 @@ ADD_LIBRARY(
|
|
btBulletXmlWorldImporter.h
|
|
string_split.cpp
|
|
string_split.h
|
|
- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp
|
|
)
|
|
|
|
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
|
|
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
|
|
|
|
IF (BUILD_SHARED_LIBS)
|
|
- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
|
+ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath ${tinyxml2_LIBRARIES})
|
|
ENDIF (BUILD_SHARED_LIBS)
|
|
|
|
IF (INSTALL_EXTRA_LIBS)
|
|
--
|
|
2.32.0
|
|
|