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

Merge remote-tracking branch 'bp/master'

Browse Source 
Conflicts:
	examples/ExampleBrowser/CMakeLists.txt
	examples/OpenGLWindow/CMakeLists.txt
This commit is contained in:
Erwin Coumans
2015-12-07 16:42:45 -08:00
parent 13f314f401 ab283251d3
commit 52f074bcb2
33 changed files with 382 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
CMakeLists.txt
View File

@@ -126,7 +126,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
ENDIF (WIN32) ENDIF (WIN32)
OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON) OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON)
@@ -151,8 +151,8 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
IF (USE_GLUT AND MSVC) IF (USE_GLUT AND MSVC)
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove_definitions(-D_WINDOWS ) remove_definitions(-D_WINDOWS )
ENDIF() ENDIF()
@@ -194,18 +194,18 @@ OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
IF(BUILD_BULLET3) IF(BUILD_BULLET3)
IF(APPLE) IF(APPLE)
MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}") MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}")
IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9) IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9)
MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option") MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option")
#unset(BUILD_OPENGL3_DEMOS CACHE) #unset(BUILD_OPENGL3_DEMOS CACHE)
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF)
ELSE() ELSE()
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON)
ENDIF() ENDIF()
ELSE() ELSE()
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON)
ENDIF() ENDIF()
ELSE(BUILD_BULLET3) ELSE(BUILD_BULLET3)
unset(BUILD_OPENGL3_DEMOS CACHE) unset(BUILD_OPENGL3_DEMOS CACHE)
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF)
@@ -221,9 +221,9 @@ ENDIF(BUILD_OPENGL3_DEMOS)
OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON) OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON)
IF(BUILD_BULLET2_DEMOS) IF(BUILD_BULLET2_DEMOS)
IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples) IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples)
SUBDIRS(examples) SUBDIRS(examples)
ENDIF() ENDIF()
ENDIF(BUILD_BULLET2_DEMOS) ENDIF(BUILD_BULLET2_DEMOS)
@@ -253,15 +253,15 @@ IF(INSTALL_LIBS)
SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name") SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
## the following are directories where stuff will be installed to ## the following are directories where stuff will be installed to
SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix") SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
IF(NOT MSVC) IF(NOT MSVC)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY)
INSTALL( INSTALL(
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/bullet.pc ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc
DESTINATION DESTINATION
${PKGCONFIG_INSTALL_PREFIX}) ${PKGCONFIG_INSTALL_PREFIX})
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
ENDIF(INSTALL_LIBS) ENDIF(INSTALL_LIBS)
@@ -279,16 +279,18 @@ ENDIF()
set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
list (APPEND BULLET_LIBRARIES LinearMath) list (APPEND BULLET_LIBRARIES LinearMath)
list (APPEND BULLET_LIBRARIES BulletInverseDynamics) IF(BUILD_BULLET3)
list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
ENDIF(BUILD_BULLET3)
list (APPEND BULLET_LIBRARIES BulletCollision) list (APPEND BULLET_LIBRARIES BulletCollision)
list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletDynamics)
list (APPEND BULLET_LIBRARIES BulletSoftBody) list (APPEND BULLET_LIBRARIES BulletSoftBody)
set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
@ONLY ESCAPE_QUOTES @ONLY ESCAPE_QUOTES
) )
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
DESTINATION ${BULLET_CONFIG_CMAKE_PATH} DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
) )

6
Extras/CMakeLists.txt
View File

@@ -1,4 +1,8 @@
SUBDIRS( Serialize InverseDynamics ConvexDecomposition HACD GIMPACTUtils ) SUBDIRS( Serialize ConvexDecomposition HACD GIMPACTUtils )
IF(BUILD_BULLET3)
SUBDIRS( InverseDynamics)
ENDIF()
#Maya Dynamica plugin is moved to http://dynamica.googlecode.com #Maya Dynamica plugin is moved to http://dynamica.googlecode.com

2
Extras/InverseDynamics/CMakeLists.txt
View File

@@ -20,7 +20,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

37
Extras/Serialize/BulletFileLoader/CMakeLists.txt
View File

@@ -21,29 +21,30 @@ btBulletFile.h
ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletFileLoader DESTINATION .) INSTALL(TARGETS BulletFileLoader DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX}) INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}") SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ENDIF (INSTALL_EXTRA_LIBS) ENDIF (INSTALL_EXTRA_LIBS)

2
Extras/Serialize/BulletWorldImporter/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

2
Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

200
build3/premake4.lua
View File

@@ -1,8 +1,8 @@
solution "0_Bullet3Solution" solution "0_Bullet3Solution"
local osversion = os.getversion() local osversion = os.getversion()
print(string.format(" %d.%d.%d (%s)", print(string.format(" %d.%d.%d (%s)",
osversion.majorversion, osversion.minorversion, osversion.revision, osversion.majorversion, osversion.minorversion, osversion.revision,
osversion.description)) osversion.description))
@@ -14,26 +14,26 @@
act = "" act = ""
if _ACTION then if _ACTION then
act = _ACTION act = _ACTION
end end
newoption { newoption {
trigger = "ios", trigger = "ios",
description = "Enable iOS target (requires xcode4)" description = "Enable iOS target (requires xcode4)"
} }
newoption newoption
{ {
trigger = "force_dlopen_opengl", trigger = "force_dlopen_opengl",
description = "Dynamically load OpenGL (instead of static/dynamic linking)" description = "Dynamically load OpenGL (instead of static/dynamic linking)"
} }
newoption newoption
{ {
trigger = "force_dlopen_x11", trigger = "force_dlopen_x11",
description = "Dynamically load OpenGL (instead of static/dynamic linking)" description = "Dynamically load OpenGL (instead of static/dynamic linking)"
} }
newoption newoption
{ {
@@ -51,8 +51,14 @@
newoption newoption
{ {
trigger = "bullet2demos", trigger = "no-demos",
description = "Compile the Bullet 2 demos (Demo/Extra folder)" description = "Don't build demos"
}
newoption
{
trigger = "no-extras",
description = "Don't build Extras"
} }
newoption newoption
@@ -60,25 +66,37 @@
trigger = "enet", trigger = "enet",
description = "Enable enet NAT punchthrough test" description = "Enable enet NAT punchthrough test"
} }
newoption newoption
{ {
trigger = "lua", trigger = "lua",
description = "Enable Lua scipting support in Example Browser" description = "Enable Lua scipting support in Example Browser"
} }
newoption { newoption {
trigger = "targetdir", trigger = "targetdir",
value = "path such as ../bin", value = "path such as ../bin",
description = "Set the output location for the generated project files" description = "Set the output location for the generated project files"
} }
newoption newoption
{ {
trigger = "without-gtest", trigger = "no-test",
description = "Disable all tests"
}
newoption
{
trigger = "no-gtest",
description = "Disable unit tests using gtest" description = "Disable unit tests using gtest"
} }
newoption
{
trigger = "no-bullet3",
description = "Do not build bullet3 libs"
}
configurations {"Release", "Debug"} configurations {"Release", "Debug"}
configuration "Release" configuration "Release"
flags { "Optimize", "EnableSSE2","StaticRuntime", "NoMinimalRebuild", "FloatFast"} flags { "Optimize", "EnableSSE2","StaticRuntime", "NoMinimalRebuild", "FloatFast"}
@@ -112,25 +130,28 @@
postfix="" postfix=""
if _ACTION == "xcode4" then if _ACTION == "xcode4" then
if _OPTIONS["ios"] then if _OPTIONS["ios"] then
postfix = "ios"; _OPTIONS["no-bullet3"] = "1"
xcodebuildsettings _OPTIONS["no-gtest"] = "1"
{
'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"', postfix = "ios";
'CODE_SIGN_IDENTITY = "iPhone Developer"',
"SDKROOT = iphoneos",
'ARCHS = "armv7"',
'TARGETED_DEVICE_FAMILY = "1,2"',
'VALID_ARCHS = "armv7"',
}
else
xcodebuildsettings xcodebuildsettings
{ {
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"', 'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
'VALID_ARCHS = "x86_64 i386"', 'CODE_SIGN_IDENTITY = "iPhone Developer"',
"SDKROOT = iphoneos",
'ARCHS = "armv7"',
'TARGETED_DEVICE_FAMILY = "1,2"',
'VALID_ARCHS = "armv7"',
}
else
xcodebuildsettings
{
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
'VALID_ARCHS = "x86_64 i386"',
-- 'SDKROOT = "macosx10.9"', -- 'SDKROOT = "macosx10.9"',
} }
end end
end end
-- comment-out for now, URDF reader needs exceptions -- comment-out for now, URDF reader needs exceptions
@@ -155,50 +176,73 @@
language "C++" language "C++"
if not _OPTIONS["ios"] then if _OPTIONS["no-bullet3"] then
print "--no-bullet3 implies --no-demos"
include "../examples/ExampleBrowser" _OPTIONS["no-demos"] = "1"
include "../examples/OpenGLWindow" else
include "../examples/SharedMemory" include "../src/Bullet3Common"
include "../examples/MultiThreading" include "../src/Bullet3Geometry"
include "../examples/ThirdPartyLibs/Gwen" include "../src/Bullet3Collision"
include "../Extras" include "../src/Bullet3Dynamics"
include "../src/Bullet3OpenCL"
include "../examples/HelloWorld" include "../src/Bullet3Serialize/Bullet2FileLoader"
include "../examples/BasicDemo"
include "../test/SharedMemory"
if _OPTIONS["enet"] then
include "../examples/ThirdPartyLibs/enet"
include "../test/enet/client"
include "../test/enet/server"
end end
if _OPTIONS["lua"] then if _OPTIONS["no-extras"] then
include "../examples/ThirdPartyLibs/lua-5.2.3" print "--no-extras implies --no-demos"
_OPTIONS["no-demos"] = "1"
else
include "../Extras"
end end
include "../src/Bullet3Common" if not _OPTIONS["no-demos"] then
include "../src/Bullet3Geometry" include "../examples/ExampleBrowser"
include "../src/Bullet3Collision" include "../examples/OpenGLWindow"
include "../src/Bullet3Dynamics" include "../examples/ThirdPartyLibs/Gwen"
include "../src/Bullet3OpenCL"
include "../src/Bullet3Serialize/Bullet2FileLoader"
if not _OPTIONS["without-gtest"] then include "../examples/HelloWorld"
include "../test/gtest-1.7.0" include "../examples/BasicDemo"
-- include "../test/hello_gtest"
include "../test/collision" include "../examples/SharedMemory"
include "../test/InverseDynamics" include "../examples/MultiThreading"
include "../test/TestBullet3OpenCL"
include "../test/GwenOpenGLTest" if _OPTIONS["lua"] then
end include "../examples/ThirdPartyLibs/lua-5.2.3"
end end
if not _OPTIONS["no-test"] then
include "../test/SharedMemory"
if _OPTIONS["enet"] then
include "../examples/ThirdPartyLibs/enet"
include "../test/enet/client"
include "../test/enet/server"
end
end
end
if not _OPTIONS["no-test"] then
include "../test/Bullet2"
if not _OPTIONS["no-gtest"] then
include "../test/gtest-1.7.0"
-- include "../test/hello_gtest"
include "../test/collision"
if not _OPTIONS["no-bullet3"] then
if not _OPTIONS["no-extras"] then
include "../test/InverseDynamics"
end
include "../test/TestBullet3OpenCL"
end
if not _OPTIONS["no-demos"] then
-- Gwen is only used for demos
include "../test/GwenOpenGLTest"
end
end
end
include "../test/Bullet2"
include "../src/BulletInverseDynamics" include "../src/BulletInverseDynamics"
include "../src/BulletSoftBody" include "../src/BulletSoftBody"
include "../src/BulletDynamics" include "../src/BulletDynamics"
include "../src/BulletCollision" include "../src/BulletCollision"
include "../src/LinearMath" include "../src/LinearMath"

56
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -68,9 +68,9 @@ SET(App_ExampleBrowser_SRCS
../DynamicControlDemo/MotorDemo.cpp ../DynamicControlDemo/MotorDemo.cpp
../DynamicControlDemo/MotorDemo.h ../DynamicControlDemo/MotorDemo.h
../MultiThreading/MultiThreadingExample.cpp ../MultiThreading/MultiThreadingExample.cpp
../MultiThreading/b3PosixThreadSupport.cpp ../MultiThreading/b3PosixThreadSupport.cpp
../MultiThreading/b3Win32ThreadSupport.cpp ../MultiThreading/b3Win32ThreadSupport.cpp
../MultiThreading/b3ThreadSupportInterface.cpp ../MultiThreading/b3ThreadSupportInterface.cpp
../RenderingExamples/TimeSeriesCanvas.cpp ../RenderingExamples/TimeSeriesCanvas.cpp
../RenderingExamples/TimeSeriesCanvas.h ../RenderingExamples/TimeSeriesCanvas.h
../RenderingExamples/TimeSeriesFontData.cpp ../RenderingExamples/TimeSeriesFontData.cpp
@@ -156,33 +156,33 @@ SET(App_ExampleBrowser_SRCS
../ThirdPartyLibs/stb_image/stb_image.cpp ../ThirdPartyLibs/stb_image/stb_image.cpp
../ThirdPartyLibs/stb_image/stb_image.h ../ThirdPartyLibs/stb_image/stb_image.h
../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
../ThirdPartyLibs/tinyxml/tinystr.cpp ../ThirdPartyLibs/tinyxml/tinystr.cpp
../ThirdPartyLibs/tinyxml/tinyxml.cpp ../ThirdPartyLibs/tinyxml/tinyxml.cpp
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h
../ThirdPartyLibs/tinyxml/tinystr.cpp ../ThirdPartyLibs/tinyxml/tinystr.cpp
../ThirdPartyLibs/tinyxml/tinyxml.cpp ../ThirdPartyLibs/tinyxml/tinyxml.cpp
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h ../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h
../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h ../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h
../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp ../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp
../ThirdPartyLibs/urdf/boost_replacement/printf_console.h ../ThirdPartyLibs/urdf/boost_replacement/printf_console.h
../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp ../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp
../ThirdPartyLibs/urdf/boost_replacement/string_split.h ../ThirdPartyLibs/urdf/boost_replacement/string_split.h
../Utils/b3Clock.cpp ../Utils/b3Clock.cpp
../Utils/b3Clock.h ../Utils/b3Clock.h
../Utils/b3ResourcePath.cpp ../Utils/b3ResourcePath.cpp
@@ -213,10 +213,8 @@ ELSE(WIN32)
ELSE(APPLE) ELSE(APPLE)
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
)
LINK_LIBRARIES( pthread dl) LINK_LIBRARIES( pthread dl)
ENDIF(APPLE) ENDIF(APPLE)
ENDIF(WIN32) ENDIF(WIN32)

6
examples/OpenGLWindow/CMakeLists.txt
View File

@@ -33,8 +33,8 @@ ENDIF(APPLE)
#no Linux detection? #no Linux detection?
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/optionalX11 ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/optionalX11
) )
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
@@ -58,7 +58,7 @@ if (BUILD_SHARED_LIBS)
target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY}) target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY})
else() else()
set (CMAKE_THREAD_PREFER_PTHREAD TRUE) set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads)
target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
endif() endif()

18
examples/SimpleOpenGL3/CMakeLists.txt
View File

@@ -3,6 +3,8 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/btgui ${BULLET_PHYSICS_SOURCE_DIR}/btgui
${BULLET_PHYSICS_SOURCE_DIR}/examples
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
) )
@@ -12,7 +14,7 @@ SET(AppSimpleOpenGL3_SRCS
) )
LINK_LIBRARIES( LINK_LIBRARIES(
gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
IF (WIN32) IF (WIN32)
@@ -26,14 +28,14 @@ ELSE(WIN32)
find_library(COCOA NAMES Cocoa) find_library(COCOA NAMES Cocoa)
MESSAGE(${COCOA}) MESSAGE(${COCOA})
link_libraries(${COCOA}) link_libraries(${COCOA})
ELSE(APPLE)
INCLUDE_DIRECTORIES( ELSE(APPLE)
${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows INCLUDE_DIRECTORIES(
) ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") )
ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
LINK_LIBRARIES( X11 pthread dl Xext) LINK_LIBRARIES( X11 pthread dl Xext)
ENDIF(APPLE) ENDIF(APPLE)

10
src/Bullet3Collision/CMakeLists.txt
View File

@@ -4,11 +4,11 @@ INCLUDE_DIRECTORIES(
) )
SET(Bullet3Collision_SRCS SET(Bullet3Collision_SRCS
BroadPhaseCollision/b3DynamicBvh.cpp BroadPhaseCollision/b3DynamicBvh.cpp
BroadPhaseCollision/b3DynamicBvhBroadphase.cpp BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
BroadPhaseCollision/b3OverlappingPairCache.cpp BroadPhaseCollision/b3OverlappingPairCache.cpp
NarrowPhaseCollision/b3ConvexUtility.cpp NarrowPhaseCollision/b3ConvexUtility.cpp
NarrowPhaseCollision/b3CpuNarrowPhase.cpp NarrowPhaseCollision/b3CpuNarrowPhase.cpp
) )
SET(Bullet3CollisionBroadPhase_HDRS SET(Bullet3CollisionBroadPhase_HDRS

26
src/Bullet3Dynamics/CMakeLists.txt
View File

@@ -14,19 +14,19 @@ SET(Bullet3Dynamics_SRCS
SET(Bullet3Dynamics_HDRS SET(Bullet3Dynamics_HDRS
b3CpuRigidBodyPipeline.h b3CpuRigidBodyPipeline.h
ConstraintSolver/b3ContactSolverInfo.h ConstraintSolver/b3ContactSolverInfo.h
ConstraintSolver/b3FixedConstraint.h ConstraintSolver/b3FixedConstraint.h
ConstraintSolver/b3Generic6DofConstraint.h ConstraintSolver/b3Generic6DofConstraint.h
ConstraintSolver/b3JacobianEntry.h ConstraintSolver/b3JacobianEntry.h
ConstraintSolver/b3PgsJacobiSolver.h ConstraintSolver/b3PgsJacobiSolver.h
ConstraintSolver/b3Point2PointConstraint.h ConstraintSolver/b3Point2PointConstraint.h
ConstraintSolver/b3SolverBody.h ConstraintSolver/b3SolverBody.h
ConstraintSolver/b3SolverConstraint.h ConstraintSolver/b3SolverConstraint.h
ConstraintSolver/b3TypedConstraint.h ConstraintSolver/b3TypedConstraint.h
shared/b3ContactConstraint4.h shared/b3ContactConstraint4.h
shared/b3ConvertConstraint4.h shared/b3ConvertConstraint4.h
shared/b3Inertia.h shared/b3Inertia.h
shared/b3IntegrateTransforms.h shared/b3IntegrateTransforms.h
) )
ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS}) ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})

56
src/Bullet3OpenCL/CMakeLists.txt
View File

@@ -3,36 +3,36 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
ADD_DEFINITIONS(-DB3_USE_CLEW) ADD_DEFINITIONS(-DB3_USE_CLEW)
SET(Bullet3OpenCL_clew_SRCS SET(Bullet3OpenCL_clew_SRCS
../clew/clew.c ../clew/clew.c
BroadphaseCollision/b3GpuGridBroadphase.cpp BroadphaseCollision/b3GpuGridBroadphase.cpp
BroadphaseCollision/b3GpuSapBroadphase.cpp BroadphaseCollision/b3GpuSapBroadphase.cpp
BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
BroadphaseCollision/b3GpuParallelLinearBvh.cpp BroadphaseCollision/b3GpuParallelLinearBvh.cpp
Initialize/b3OpenCLUtils.cpp Initialize/b3OpenCLUtils.cpp
NarrowphaseCollision/b3ContactCache.cpp NarrowphaseCollision/b3ContactCache.cpp
NarrowphaseCollision/b3ConvexHullContact.cpp NarrowphaseCollision/b3ConvexHullContact.cpp
NarrowphaseCollision/b3GjkEpa.cpp NarrowphaseCollision/b3GjkEpa.cpp
NarrowphaseCollision/b3GjkPairDetector.cpp NarrowphaseCollision/b3GjkPairDetector.cpp
NarrowphaseCollision/b3OptimizedBvh.cpp NarrowphaseCollision/b3OptimizedBvh.cpp
NarrowphaseCollision/b3QuantizedBvh.cpp NarrowphaseCollision/b3QuantizedBvh.cpp
NarrowphaseCollision/b3StridingMeshInterface.cpp NarrowphaseCollision/b3StridingMeshInterface.cpp
NarrowphaseCollision/b3TriangleCallback.cpp NarrowphaseCollision/b3TriangleCallback.cpp
NarrowphaseCollision/b3TriangleIndexVertexArray.cpp NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
NarrowphaseCollision/b3VoronoiSimplexSolver.cpp NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
ParallelPrimitives/b3BoundSearchCL.cpp ParallelPrimitives/b3BoundSearchCL.cpp
ParallelPrimitives/b3FillCL.cpp ParallelPrimitives/b3FillCL.cpp
ParallelPrimitives/b3LauncherCL.cpp ParallelPrimitives/b3LauncherCL.cpp
ParallelPrimitives/b3PrefixScanCL.cpp ParallelPrimitives/b3PrefixScanCL.cpp
ParallelPrimitives/b3PrefixScanFloat4CL.cpp ParallelPrimitives/b3PrefixScanFloat4CL.cpp
ParallelPrimitives/b3RadixSort32CL.cpp ParallelPrimitives/b3RadixSort32CL.cpp
Raycast/b3GpuRaycast.cpp Raycast/b3GpuRaycast.cpp
RigidBody/b3GpuGenericConstraint.cpp RigidBody/b3GpuGenericConstraint.cpp
RigidBody/b3GpuJacobiContactSolver.cpp RigidBody/b3GpuJacobiContactSolver.cpp
RigidBody/b3GpuNarrowPhase.cpp RigidBody/b3GpuNarrowPhase.cpp
RigidBody/b3GpuPgsConstraintSolver.cpp RigidBody/b3GpuPgsConstraintSolver.cpp
RigidBody/b3GpuPgsContactSolver.cpp RigidBody/b3GpuPgsContactSolver.cpp
RigidBody/b3GpuRigidBodyPipeline.cpp RigidBody/b3GpuRigidBodyPipeline.cpp
RigidBody/b3Solver.cpp RigidBody/b3Solver.cpp
) )

24
src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
View File

@@ -4,23 +4,23 @@ INCLUDE_DIRECTORIES(
) )
SET(Bullet2FileLoader_SRCS SET(Bullet2FileLoader_SRCS
b3BulletFile.cpp b3BulletFile.cpp
b3Chunk.cpp b3Chunk.cpp
b3DNA.cpp b3DNA.cpp
b3File.cpp b3File.cpp
b3Serializer.cpp b3Serializer.cpp
) )
SET(Bullet2FileLoader_HDRS SET(Bullet2FileLoader_HDRS
b3BulletFile.h b3BulletFile.h
b3Chunk.h b3Chunk.h
b3Common.h b3Common.h
b3Defines.h b3Defines.h
b3DNA.h b3DNA.h
b3File.h b3File.h
b3Serializer.h b3Serializer.h
autogenerated/bullet2.h autogenerated/bullet2.h
) )
ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS}) ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS})

3
src/CMakeLists.txt
View File

@@ -1,9 +1,10 @@
IF(BUILD_BULLET3) IF(BUILD_BULLET3)
SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common ) SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common )
SUBDIRS( BulletInverseDynamics )
ENDIF(BUILD_BULLET3) ENDIF(BUILD_BULLET3)
SUBDIRS( BulletSoftBody BulletInverseDynamics BulletCollision BulletDynamics LinearMath ) SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
IF(INSTALL_LIBS) IF(INSTALL_LIBS)

8
test/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
#SUBDIRS( gtest-1.7.0 TestBullet3OpenCL) IF(BUILD_BULLET3)
SUBDIRS( gtest-1.7.0 collision InverseDynamics) #SUBDIRS( TestBullet3OpenCL )
SUBDIRS( InverseDynamics )
ENDIF(BUILD_BULLET3)
SUBDIRS( gtest-1.7.0 collision )