From ebf78cb75452e536ba29cb0f2b1ee067fac706f0 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 24 Sep 2017 10:45:08 -0700 Subject: [PATCH 1/3] manually apply pull request 457 PR #457 Thanks to aaronmjacobs! --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e5f009df..f1d17027b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -449,7 +449,11 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake @ONLY ESCAPE_QUOTES ) -install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake +OPTION(INSTALL_CMAKE_FILES "Install generated CMake files" ON) + +IF (INSTALL_CMAKE_FILES) + install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake DESTINATION ${BULLET_CONFIG_CMAKE_PATH} ) +ENDIF (INSTALL_CMAKE_FILES) From 70974c76da6ed6227ee5b0e28e09e541ba8b7196 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 24 Sep 2017 11:41:24 -0700 Subject: [PATCH 2/3] add a few more contributors (the list is far from complete though) --- AUTHORS.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 556e6f641..1bff63207 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -2,17 +2,21 @@ Bullet Physics is created by Erwin Coumans with contributions from the following AMD Apple +Yunfei Bai Steve Baker Gino van den Bergen +Jeff Bingham Nicola Candussi Erin Catto Lawrence Chai Erwin Coumans -Christer Ericson Disney Animation +Benjamin Ellenberger +Christer Ericson Google Dirk Gregorius Marcus Hennix +Jasmine Hsu MBSim Development Team Takahiro Harada Simon Hobbs @@ -20,6 +24,7 @@ John Hsu Ole Kniemeyer Jay Lee Francisco Leon +lunkhound Vsevolod Klementjev Phil Knight John McCutchan @@ -32,9 +37,9 @@ Russel Smith Sony Jakub Stephien Marten Svanfeldt +Jie Tan Pierre Terdiman Steven Thompson Tamas Umenhoffer -Yunfei Bai If your name is missing, please send an email to erwin.coumans@gmail.com or file an issue at http://github.com/bulletphysics/bullet3 From 97509dc9d0261173ef19a023ee3661a8f4b4f870 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 24 Sep 2017 16:10:14 -0700 Subject: [PATCH 3/3] add some missing files for premake, thanks to Jeff Bingham for the report --- examples/SharedMemory/tcp/premake4.lua | 2 ++ examples/SharedMemory/udp/premake4.lua | 2 ++ test/SharedMemory/premake4.lua | 1 + 3 files changed, 5 insertions(+) diff --git a/examples/SharedMemory/tcp/premake4.lua b/examples/SharedMemory/tcp/premake4.lua index 6df7cd949..9c940402e 100644 --- a/examples/SharedMemory/tcp/premake4.lua +++ b/examples/SharedMemory/tcp/premake4.lua @@ -89,6 +89,8 @@ myfiles = "../PhysicsServerCommandProcessor.cpp", "../PhysicsServerCommandProcessor.h", "../b3PluginManager.cpp", + "../PhysicsDirect.cpp", + "../PhysicsClient.cpp", "../TinyRendererVisualShapeConverter.cpp", "../TinyRendererVisualShapeConverter.h", "../../TinyRenderer/geometry.cpp", diff --git a/examples/SharedMemory/udp/premake4.lua b/examples/SharedMemory/udp/premake4.lua index 3e5e4120b..26aeebc0b 100644 --- a/examples/SharedMemory/udp/premake4.lua +++ b/examples/SharedMemory/udp/premake4.lua @@ -80,6 +80,8 @@ myfiles = "../PhysicsServerCommandProcessor.cpp", "../PhysicsServerCommandProcessor.h", "../b3PluginManager.cpp", + "../PhysicsDirect.cpp", + "../PhysicsClient.cpp", "../TinyRendererVisualShapeConverter.cpp", "../TinyRendererVisualShapeConverter.h", "../../TinyRenderer/geometry.cpp", diff --git a/test/SharedMemory/premake4.lua b/test/SharedMemory/premake4.lua index 40c0d6f42..85b74ccfb 100644 --- a/test/SharedMemory/premake4.lua +++ b/test/SharedMemory/premake4.lua @@ -178,6 +178,7 @@ project ("Test_PhysicsServerLoopBack") "../../examples/SharedMemory/PhysicsServerCommandProcessor.cpp", "../../examples/SharedMemory/PhysicsServerCommandProcessor.h", "../../examples/SharedMemory/b3PluginManager.cpp", + "../../examples/SharedMemory/PhysicsDirect.cpp", "../../examples/SharedMemory/PhysicsLoopBack.cpp", "../../examples/SharedMemory/PhysicsLoopBack.h", "../../examples/SharedMemory/PhysicsLoopBackC_API.cpp",