From 11cfbc489d2aaa67e77a3ca1309cf576f7de5e6a Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Mon, 10 Sep 2007 01:25:09 +0000 Subject: [PATCH] upgraded version, fixed compiling issues --- Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp | 4 ++-- VERSION | 2 +- configure | 20 +++++++++---------- configure.ac | 2 +- .../BroadphaseCollision/btAxisSweep3.cpp | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index 3939b0c31..98a2582c4 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -14,8 +14,8 @@ subject to the following restrictions: */ //enable just one, DO_BENCHMARK_PYRAMIDS or DO_WALL -#define DO_BENCHMARK_PYRAMIDS 1 -//#define DO_WALL 1 +//#define DO_BENCHMARK_PYRAMIDS 1 +#define DO_WALL 1 //Note: some of those settings need 'DO_WALL' demo //#define USE_KINEMATIC_GROUND 1 diff --git a/VERSION b/VERSION index 5ba9c5b50..152535156 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -Bullet Collision Detection and Physics Library version 2.57 +Bullet Collision Detection and Physics Library version 2.58 http://bullet.sourceforge.net diff --git a/configure b/configure index 707d6934f..855815061 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for bullet 2.57. +# Generated by GNU Autoconf 2.59 for bullet 2.58. # # Report bugs to . # @@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='bullet' PACKAGE_TARNAME='bullet' -PACKAGE_VERSION='2.57' -PACKAGE_STRING='bullet 2.57' +PACKAGE_VERSION='2.58' +PACKAGE_STRING='bullet 2.58' PACKAGE_BUGREPORT='bullet@erwincoumans.com' ac_unique_file="mk/jam/build.jam" @@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then # 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. cat <<_ACEOF -\`configure' configures bullet 2.57 to adapt to many kinds of systems. +\`configure' configures bullet 2.58 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -855,7 +855,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bullet 2.57:";; + short | recursive ) echo "Configuration of bullet 2.58:";; esac cat <<\_ACEOF @@ -980,7 +980,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -bullet configure 2.57 +bullet configure 2.58 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -994,7 +994,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bullet $as_me 2.57, which was +It was created by bullet $as_me 2.58, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -9898,7 +9898,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ; " cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ; " - for cs_veritem in 2 57; do + for cs_veritem in 2 58; do cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ; " done @@ -10275,7 +10275,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by bullet $as_me 2.57, which was +This file was extended by bullet $as_me 2.58, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10338,7 +10338,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -bullet config.status 2.57 +bullet config.status 2.58 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index a8272ab85..3e1560264 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_PREREQ([2.54]) #---------------------------------------------------------------------------- AC_INIT( [bullet], - [2.57], + [2.58], [bullet@erwincoumans.com]) CS_PACKAGEINFO( [Bullet Continuous Collision Detection and Physics Library], diff --git a/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp index 272b700b9..d7eea33ea 100644 --- a/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp +++ b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp @@ -22,7 +22,7 @@ #include btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache) -:btAxisSweep3Internal(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache) +:btAxisSweep3Internal(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache) { // 1 handle is reserved as sentinel btAssert(maxHandles > 1 && maxHandles < 32767); @@ -31,7 +31,7 @@ btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAab bt32BitAxisSweep3::bt32BitAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned int maxHandles , btOverlappingPairCache* pairCache ) -:btAxisSweep3Internal(worldAabbMin,worldAabbMax,0xfffffffe,0x7fffffff,maxHandles,pairCache) +:btAxisSweep3Internal(worldAabbMin,worldAabbMax,0xfffffffe,0x7fffffff,maxHandles,pairCache) { // 1 handle is reserved as sentinel btAssert(maxHandles > 1 && maxHandles < 2147483647);