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

updated cmake for ForkLiftDemo, removed DinoDemo (it breaks cmake due to c/c++ mixing)

Browse Source
This commit is contained in:
erwin.coumans
2008-09-06 15:43:20 +00:00
parent 02112b0687
commit 5e92e6b661
7 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -25,7 +25,8 @@ MESSAGE("OPENGL NOT FOUND")
SET(OPENGL_gl_LIBRARY opengl32) SET(OPENGL_gl_LIBRARY opengl32)
SET(OPENGL_glu_LIBRARY glu32) SET(OPENGL_glu_LIBRARY glu32)
ENDIF (OPENGL_FOUND) ENDIF (OPENGL_FOUND)
ADD_DEFINITIONS(-DBT_USE_FREEGLUT)
# ADD_DEFINITIONS(-DBT_USE_FREEGLUT)
FIND_PACKAGE(GLU) FIND_PACKAGE(GLU)

4
ChangeLog.txt
View File

@@ -4,6 +4,10 @@ Primary author and maintainer: Erwin Coumans
Todo: update changelog from April - July 2008 Todo: update changelog from April - July 2008
See http://code.google.com/p/bullet/source/list for more complete log in Subversion See http://code.google.com/p/bullet/source/list for more complete log in Subversion
2008 Sept 5
- Enabled Demos/ForkLiftDemo
Thanks Roman Ponomarev.
2008 Sept 4 2008 Sept 4
- Added btCudaBroadphase in Extras/CUDA: some research into accelerating Bullet using CUDA. - Added btCudaBroadphase in Extras/CUDA: some research into accelerating Bullet using CUDA.
Thanks to the particle demo from the NVidia CUDA SDK. Thanks to the particle demo from the NVidia CUDA SDK.

4
Demos/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
if (CMAKE_SIZEOF_VOID_P MATCHES "8") if (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( OpenGL AllBulletDemos BulletDinoDemo ConvexDecompositionDemo Benchmarks HelloWorld CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo ) SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )
else (CMAKE_SIZEOF_VOID_P MATCHES "8") else (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( OpenGL AllBulletDemos BulletDinoDemo ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo ) SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )
endif (CMAKE_SIZEOF_VOID_P MATCHES "8") endif (CMAKE_SIZEOF_VOID_P MATCHES "8")

5
Demos/ForkLiftDemo/CMakeLists.txt
View File

@@ -48,14 +48,15 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
) )
ADD_EXECUTABLE(ForkLiftDemo ADD_EXECUTABLE(ForkLiftDemo
ForkLiftDemo.cpp ForkLiftDemo.cpp
main.cpp
) )

2
Demos/Jamfile
View File

@@ -77,7 +77,7 @@ SubInclude TOP Demos CcdPhysicsDemo ;
SubInclude TOP Demos Benchmarks ; SubInclude TOP Demos Benchmarks ;
SubInclude TOP Demos UserCollisionAlgorithm ; SubInclude TOP Demos UserCollisionAlgorithm ;
SubInclude TOP Demos MultiThreadedDemo ; SubInclude TOP Demos MultiThreadedDemo ;
#SubInclude TOP Demos ForkLiftDemo ; SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BulletDinoDemo ; SubInclude TOP Demos BulletDinoDemo ;
SubInclude TOP Demos EPAPenDepthDemo ; SubInclude TOP Demos EPAPenDepthDemo ;
SubInclude TOP Demos HelloWorld ; SubInclude TOP Demos HelloWorld ;

22
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for bullet 2.69. # Generated by GNU Autoconf 2.61 for bullet 2.71.
# #
# Report bugs to <bullet@erwincoumans.com>. # Report bugs to <bullet@erwincoumans.com>.
# #
@@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='bullet' PACKAGE_NAME='bullet'
PACKAGE_TARNAME='bullet' PACKAGE_TARNAME='bullet'
PACKAGE_VERSION='2.69' PACKAGE_VERSION='2.71'
PACKAGE_STRING='bullet 2.69' PACKAGE_STRING='bullet 2.71'
PACKAGE_BUGREPORT='bullet@erwincoumans.com' PACKAGE_BUGREPORT='bullet@erwincoumans.com'
ac_unique_file="mk/jam/build.jam" ac_unique_file="mk/jam/build.jam"
@@ -1224,7 +1224,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures bullet 2.69 to adapt to many kinds of systems. \`configure' configures bullet 2.71 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of bullet 2.69:";; short | recursive ) echo "Configuration of bullet 2.71:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -1385,7 +1385,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
bullet configure 2.69 bullet configure 2.71
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1399,7 +1399,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by bullet $as_me 2.69, which was It was created by bullet $as_me 2.71, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@@ -1753,7 +1753,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PACKAGE_LONGNAME="Bullet Continuous Collision Detection and Physics Library" PACKAGE_LONGNAME="Bullet Continuous Collision Detection and Physics Library"
PACKAGE_COPYRIGHT="Copyright (c) 2005-2007 Erwin Coumans" PACKAGE_COPYRIGHT="Copyright (c) 2005-2008 Erwin Coumans"
PACKAGE_HOMEPAGE="http://www.bulletphysics.com" PACKAGE_HOMEPAGE="http://www.bulletphysics.com"
@@ -10533,7 +10533,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ;
" "
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ; cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
" "
for cs_veritem in 2 69; do for cs_veritem in 2 71; do
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ; cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
" "
done done
@@ -10944,7 +10944,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by bullet $as_me 2.69, which was This file was extended by bullet $as_me 2.71, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -10997,7 +10997,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
bullet config.status 2.69 bullet config.status 2.71
configured by $0, generated by GNU Autoconf 2.61, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

4
configure.ac
View File

@@ -9,11 +9,11 @@ AC_PREREQ([2.54])
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
AC_INIT( AC_INIT(
[bullet], [bullet],
[2.70], [2.71],
[bullet@erwincoumans.com]) [bullet@erwincoumans.com])
CS_PACKAGEINFO( CS_PACKAGEINFO(
[Bullet Continuous Collision Detection and Physics Library], [Bullet Continuous Collision Detection and Physics Library],
[Copyright (c) 2005-2007 Erwin Coumans], [Copyright (c) 2005-2008 Erwin Coumans],
[http://www.bulletphysics.com]) [http://www.bulletphysics.com])
AC_CONFIG_SRCDIR([mk/jam/build.jam]) AC_CONFIG_SRCDIR([mk/jam/build.jam])
AC_CONFIG_AUX_DIR([mk/autoconf]) AC_CONFIG_AUX_DIR([mk/autoconf])