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

upgrade version of projectfiles, cmake

Browse Source 
fix build for msvc 6.0
This commit is contained in:
erwin.coumans
2009-02-06 05:37:37 +00:00
parent f7092c0767
commit 5593a23417
38 changed files with 148 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.4)
PROJECT(BULLET_PHYSICS)
SET(BULLET_VERSION 2.73)
SET(BULLET_VERSION 2.74)
IF (NOT CMAKE_BUILD_TYPE)
# SET(CMAKE_BUILD_TYPE "Debug")

8
msvc/appAllBulletDemos.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "AllBulletDemos"
#ifdef CS_DEBUG

8
msvc/appBasicDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "BasicDemo"
#ifdef CS_DEBUG

8
msvc/appBenchmarks.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "Benchmarks"
#ifdef CS_DEBUG

8
msvc/appBspDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "BspDemo"
#ifdef CS_DEBUG

8
msvc/appBulletDino.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "BulletDino"
#ifdef CS_DEBUG

8
msvc/appCcdPhysicsDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "CcdPhysicsDemo"
#ifdef CS_DEBUG

8
msvc/appCharacterDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "CharacterDemo"
#ifdef CS_DEBUG

8
msvc/appColladaDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ColladaDemo"
#ifdef CS_DEBUG

8
msvc/appCollisionDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "CollisionDemo"
#ifdef CS_DEBUG

8
msvc/appCollisionInterfaceDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "CollisionInterfaceDemo"
#ifdef CS_DEBUG

8
msvc/appConcaveDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ConcaveDemo"
#ifdef CS_DEBUG

8
msvc/appConstraintDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ConstraintDemo"
#ifdef CS_DEBUG

8
msvc/appContinuousConvexCollision.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ContinuousConvexCollision"
#ifdef CS_DEBUG

8
msvc/appConvexDecompositionDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ConvexDecompositionDemo"
#ifdef CS_DEBUG

8
msvc/appDoublePrecisionDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "DoublePrecisionDemo"
#ifdef CS_DEBUG

8
msvc/appEPAPenDepthDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "EPAPenDepthDemo"
#ifdef CS_DEBUG

8
msvc/appForkLiftDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "ForkLiftDemo"
#ifdef CS_DEBUG

8
msvc/appGenericJointDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "GenericJointDemo"
#ifdef CS_DEBUG

8
msvc/appGimpactTestDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "GimpactTestDemo"
#ifdef CS_DEBUG

8
msvc/appGjkConvexCastDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "GjkConvexCastDemo"
#ifdef CS_DEBUG

8
msvc/appHeightFieldFluidDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "HeightFieldFluidDemo"
#ifdef CS_DEBUG

8
msvc/appHelloWorld.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "HelloWorld"
#ifdef CS_DEBUG

8
msvc/appMovingConcaveDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "MovingConcaveDemo"
#ifdef CS_DEBUG

8
msvc/appMultiMaterialDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "MultiMaterialDemo"
#ifdef CS_DEBUG

8
msvc/appMultiThreadedDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "MultiThreadedDemo"
#ifdef CS_DEBUG

8
msvc/appRagdollDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "RagdollDemo"
#ifdef CS_DEBUG

8
msvc/appRaytracer.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "Raytracer"
#ifdef CS_DEBUG

8
msvc/appSimplexDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "SimplexDemo"
#ifdef CS_DEBUG

8
msvc/appSliderConstraintDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "SliderConstraintDemo"
#ifdef CS_DEBUG

8
msvc/appSoftBodyDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "SoftBodyDemo"
#ifdef CS_DEBUG

8
msvc/appTerrainDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "TerrainDemo"
#ifdef CS_DEBUG

8
msvc/appUserCollisionAlgorithm.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "UserCollisionAlgorithm"
#ifdef CS_DEBUG

8
msvc/appVehicleDemo.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "VehicleDemo"
#ifdef CS_DEBUG

8
msvc/appiffCheck.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "iffCheck"
#ifdef CS_DEBUG

8
msvc/appiffCreateTest.rc
View File

@@ -1,8 +1,8 @@
// This file is generated automatically.
1 VERSIONINFO
FILEVERSION 2, 73, 0, 0
PRODUCTVERSION 2, 73, 0, 0
FILEVERSION 2, 74, 0, 0
PRODUCTVERSION 2, 74, 0, 0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
BLOCK "040904E4"
{
VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
VALUE "ProductVersion", "2.73"
VALUE "FileVersion", "2.73"
VALUE "ProductVersion", "2.74"
VALUE "FileVersion", "2.74"
VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans"
VALUE "FileDescription", "iffCreateTest"
#ifdef CS_DEBUG

2
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
View File

@@ -508,7 +508,7 @@ void btGeneric6DofConstraint::getInfo1 (btConstraintInfo1* info)
}
}
//test angular limits
for (int i=0;i<3 ;i++ )
for (i=0;i<3 ;i++ )
{
if(testAngularLimitMotor(i))
{

11
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -398,9 +398,9 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
{
int totalNumRows = 0;
int i;
//calculate the total number of contraint rows
for (int i=0;i<numConstraints;i++)
for (i=0;i<numConstraints;i++)
{
btTypedConstraint::btConstraintInfo1 info1;
@@ -416,7 +416,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
///setup the btSolverConstraints
int currentRow = 0;
for (int i=0;i<numConstraints;i++,currentRow+=info1.m_numConstraintRows)
for (i=0;i<numConstraints;i++,currentRow+=info1.m_numConstraintRows)
{
constraints[i]->getInfo1(&info1);
if (info1.m_numConstraintRows)
@@ -437,7 +437,8 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
btSolverBody* bodyAPtr = &m_tmpSolverBodyPool[solverBodyIdA];
btSolverBody* bodyBPtr = &m_tmpSolverBodyPool[solverBodyIdB];
for (int j=0;j<info1.m_numConstraintRows;j++)
int j;
for ( j=0;j<info1.m_numConstraintRows;j++)
{
memset(&currentConstraintRow[j],0,sizeof(btSolverConstraint));
currentConstraintRow[j].m_lowerLimit = -FLT_MAX;
@@ -471,7 +472,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
constraints[i]->getInfo2(&info2);
///finalize the constraint setup
for (int j=0;j<info1.m_numConstraintRows;j++)
for ( j=0;j<info1.m_numConstraintRows;j++)
{
btSolverConstraint& solverConstraint = currentConstraintRow[j];