added autogenerated projectfiles for softbody demo and removed libboxbox and libquickstep, they are now part of Bullet collision/dynamics.

msvc/6/appAllBulletDemos.dsp

@@ -162,6 +162,10 @@ SOURCE=..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Demos\AllBulletDemos\..\Benchmarks\BenchmarkDemo.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp
 # End Source File
 # Begin Source File

msvc/6/appSoftBodyDemo.dsp

@@ -0,0 +1,185 @@
+# Microsoft Developer Studio Project File - Name="appSoftBodyDemo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=appSoftBodyDemo - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "appSoftBodyDemo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "appSoftBodyDemo.mak" CFG="appSoftBodyDemo - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "appSoftBodyDemo - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application")
+!MESSAGE "appSoftBodyDemo - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "appSoftBodyDemo - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application")
+!MESSAGE "appSoftBodyDemo - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "appSoftBodyDemo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "release"
+# PROP BASE Intermediate_Dir "release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\out\release6\build\appSoftBodyDemo\"
+# PROP Intermediate_Dir "..\..\out\release6\build\appSoftBodyDemo\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386 /OPT:NOREF /out:"..\..\SoftBodyDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
+
+!ELSEIF  "$(CFG)" == "appSoftBodyDemo - Win32 ReleaseDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "release_dbl"
+# PROP BASE Intermediate_Dir "release_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\release_dbl6\build\appSoftBodyDemo\"
+# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appSoftBodyDemo\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386  /out:"..\..\SoftBodyDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
+
+!ELSEIF  "$(CFG)" == "appSoftBodyDemo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "debug"
+# PROP BASE Intermediate_Dir "debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\out\debug6\build\appSoftBodyDemo\"
+# PROP Intermediate_Dir "..\..\out\debug6\build\appSoftBodyDemo\"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /out:"..\..\SoftBodyDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
+
+!ELSEIF  "$(CFG)" == "appSoftBodyDemo - Win32 DebugDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "debug_dbl"
+# PROP BASE Intermediate_Dir "debug_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\debug_dbl6\build\appSoftBodyDemo\"
+# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appSoftBodyDemo\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386  /out:"..\..\SoftBodyDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
+
+!ENDIF 
+
+# Begin Target
+
+# Name "appSoftBodyDemo - Win32 Release"
+# Name "appSoftBodyDemo - Win32 ReleaseDoublePrecision"
+# Name "appSoftBodyDemo - Win32 Debug"
+# Name "appSoftBodyDemo - Win32 DebugDoublePrecision"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Demos\SoftDemo\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\SoftDemo\SoftDemo.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Demos\SoftDemo\SoftDemo.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\msvc\appSoftBodyDemo.rc
+# End Source File
+# End Group
+# End Target
+# End Project

msvc/6/libboxbox.dsp

@@ -1,183 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libboxbox" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libboxbox - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libboxbox.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libboxbox.mak" CFG="libboxbox - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libboxbox - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libboxbox - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libboxbox - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libboxbox - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libboxbox - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "release"
-# PROP BASE Intermediate_Dir "release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\out\release6\build\libboxbox\"
-# PROP Intermediate_Dir "..\..\out\release6\build\libboxbox\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libboxbox\libboxbox.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libboxbox.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libboxbox - Win32 ReleaseDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "release_dbl"
-# PROP BASE Intermediate_Dir "release_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\release_dbl6\build\libboxbox\"
-# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libboxbox\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libboxbox\libboxbox.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libboxbox - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "debug"
-# PROP BASE Intermediate_Dir "debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\out\debug6\build\libboxbox\"
-# PROP Intermediate_Dir "..\..\out\debug6\build\libboxbox\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libboxbox\libboxbox.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libboxbox_d.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libboxbox - Win32 DebugDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "debug_dbl"
-# PROP BASE Intermediate_Dir "debug_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\debug_dbl6\build\libboxbox\"
-# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libboxbox\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libboxbox\libboxbox.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libboxbox - Win32 Release"
-# Name "libboxbox - Win32 ReleaseDoublePrecision"
-# Name "libboxbox - Win32 Debug"
-# Name "libboxbox - Win32 DebugDoublePrecision"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.h
-# End Source File
-# End Group
-# End Target
-# End Project

msvc/6/libbulletcollision.dsp

@@ -188,6 +188,14 @@ SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp
 # End Source File
 # Begin Source File
@@ -380,6 +388,10 @@ SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp
 # End Source File
 # Begin Source File
@@ -448,6 +460,14 @@ SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h
 # End Source File
 # Begin Source File
@@ -664,6 +684,10 @@ SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.h
 # End Source File
 # Begin Source File

msvc/6/libbulletdynamics.dsp

@@ -176,6 +176,22 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp
 # End Source File
 # Begin Source File
@@ -188,6 +204,10 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp
 # End Source File
 # Begin Source File
@@ -212,6 +232,14 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBody.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp
 # End Source File
 # Begin Source File
@@ -252,6 +280,30 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h
 # End Source File
 # Begin Source File
@@ -272,6 +324,10 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h
 # End Source File
 # Begin Source File
@@ -296,6 +352,14 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBody.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\SoftBody\btSparseSDF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h
 # End Source File
 # Begin Source File

msvc/6/libbulletmath.dsp

@@ -196,6 +196,10 @@ SOURCE=..\..\src\LinearMath\btGeometryUtil.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\LinearMath\btHashMap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\LinearMath\btIDebugDraw.h
 # End Source File
 # Begin Source File
@@ -256,10 +260,6 @@ SOURCE=..\..\src\LinearMath\btTransformUtil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\btTypedUserInfo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\LinearMath\btVector3.h
 # End Source File
 # End Group

msvc/6/libquickstep.dsp

@@ -1,219 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libquickstep" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libquickstep - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libquickstep.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libquickstep.mak" CFG="libquickstep - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libquickstep - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libquickstep - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libquickstep - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libquickstep - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libquickstep - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "release"
-# PROP BASE Intermediate_Dir "release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\out\release6\build\libquickstep\"
-# PROP Intermediate_Dir "..\..\out\release6\build\libquickstep\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libquickstep.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libquickstep - Win32 ReleaseDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "release_dbl"
-# PROP BASE Intermediate_Dir "release_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\release_dbl6\build\libquickstep\"
-# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libquickstep\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libquickstep - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "debug"
-# PROP BASE Intermediate_Dir "debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\out\debug6\build\libquickstep\"
-# PROP Intermediate_Dir "..\..\out\debug6\build\libquickstep\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libquickstep_d.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libquickstep - Win32 DebugDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "debug_dbl"
-# PROP BASE Intermediate_Dir "debug_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\debug_dbl6\build\libquickstep\"
-# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libquickstep\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libquickstep - Win32 Release"
-# Name "libquickstep - Win32 ReleaseDoublePrecision"
-# Name "libquickstep - Win32 Debug"
-# Name "libquickstep - Win32 DebugDoublePrecision"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeConstraintSolver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeContactJoint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeJoint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeSolverBody.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeTypedJoint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\SorLcp.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeConstraintSolver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeContactJoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeJoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeMacros.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeSolverBody.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\OdeTypedJoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\quickstep\SorLcp.h
-# End Source File
-# End Group
-# End Target
-# End Project

msvc/6/wksbullet.dsw

@@ -72,6 +72,33 @@ Package=<4>
 
 ###############################################################################
 
+Project: "appBenchmarks"=.\appBenchmarks.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libbulletcollision
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletdynamics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletmath
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletopenglsupport
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libconvexhull
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "appBspDemo"=.\appBspDemo.dsp - Package Owner=<4>
 
 Package=<5>
@@ -702,6 +729,33 @@ Package=<4>
 
 ###############################################################################
 
+Project: "appSoftBodyDemo"=.\appSoftBodyDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libbulletcollision
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletdynamics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletmath
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletopenglsupport
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libconvexhull
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "appUserCollisionAlgorithm"=.\appUserCollisionAlgorithm.dsp - Package Owner=<4>
 
 Package=<5>
@@ -771,6 +825,9 @@ Package=<4>
     Project_Dep_Name appBasicDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appBenchmarks
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appBspDemo
     End Project Dependency
     Begin Project Dependency
@@ -837,15 +894,15 @@ Package=<4>
     Project_Dep_Name appSimplexDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appSoftBodyDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appUserCollisionAlgorithm
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name appVehicleDemo
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libboxbox
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libBulletColladaConverter
     End Project Dependency
     Begin Project Dependency
@@ -884,9 +941,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name liblibxml
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libquickstep
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -906,6 +960,9 @@ Package=<4>
     Project_Dep_Name appBasicDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appBenchmarks
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appBspDemo
     End Project Dependency
     Begin Project Dependency
@@ -972,6 +1029,9 @@ Package=<4>
     Project_Dep_Name appSimplexDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appSoftBodyDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appUserCollisionAlgorithm
     End Project Dependency
     Begin Project Dependency
@@ -989,9 +1049,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libboxbox
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libBulletColladaConverter
     End Project Dependency
@@ -1031,21 +1088,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name liblibxml
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libquickstep
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libboxbox"=.\libboxbox.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
 }}}
 
 ###############################################################################
@@ -1206,18 +1248,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libquickstep"=.\libquickstep.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Global:
 
 Package=<5>

msvc/7/appAllBulletDemos.vcproj

@@ -300,6 +300,9 @@
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\Benchmarks\BenchmarkDemo.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
 			</File>

msvc/7/appSoftBodyDemo.vcproj

@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="appSoftBodyDemo"
+	ProjectGUID="{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release7\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\release7\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\release7\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\release7\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\release7\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\release7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseSoftBodyDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release7\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl7\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\release_dbl7\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\release_dbl7\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\release_dbl7\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\release_dbl7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblSoftBodyDemo.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug7\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\debug7\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\debug7\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\debug7\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\debug7\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\debug7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugSoftBodyDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug7\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl7\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\debug_dbl7\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl7\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\debug_dbl7\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblSoftBodyDemo.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl7\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\SoftDemo\main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath="..\..\msvc\appSoftBodyDemo.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

msvc/7/libboxbox.vcproj

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="libboxbox"
-	ProjectGUID="{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release7\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release7\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release7\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release7\build\libboxbox\"
-				ObjectFile="..\..\out\release7\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release7\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release7\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release7\libs\libboxbox.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release7\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl7\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release_dbl7\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release_dbl7\build\libboxbox\"
-				ObjectFile="..\..\out\release_dbl7\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release_dbl7\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl7\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl7\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug7\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug7\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug7\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug7\build\libboxbox\"
-				ObjectFile="..\..\out\debug7\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug7\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug7\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug7\libs\libboxbox_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug7\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl7\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug_dbl7\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl7\build\libboxbox\"
-				ObjectFile="..\..\out\debug_dbl7\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl7\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl7\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/7/libbulletcollision.vcproj

@@ -307,6 +307,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp">
 			</File>
@@ -451,6 +457,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp">
 			</File>
@@ -503,6 +512,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
 			</File>
@@ -665,6 +680,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.h">
 			</File>

msvc/7/libbulletdynamics.vcproj

@@ -298,6 +298,18 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
 			</File>
@@ -307,6 +319,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
@@ -325,6 +340,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -356,6 +377,24 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h">
 			</File>
@@ -371,6 +410,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
@@ -389,6 +431,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSparseSDF.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>

msvc/7/libbulletmath.vcproj

@@ -314,6 +314,9 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>
+			<File
+				RelativePath="..\..\src\LinearMath\btHashMap.h">
+			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
@@ -359,9 +362,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btTypedUserInfo.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>

msvc/7/libquickstep.vcproj

@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="libquickstep"
-	ProjectGUID="{D7036964-B44D-8207-0ACC-D838D0BDA379}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release7\build\libquickstep\"
-			IntermediateDirectory="..\..\out\release7\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release7\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\release7\build\libquickstep\"
-				ObjectFile="..\..\out\release7\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\release7\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release7\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release7\libs\libquickstep.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release7\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl7\build\libquickstep\"
-			IntermediateDirectory="..\..\out\release_dbl7\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\release_dbl7\build\libquickstep\"
-				ObjectFile="..\..\out\release_dbl7\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\release_dbl7\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl7\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl7\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug7\build\libquickstep\"
-			IntermediateDirectory="..\..\out\debug7\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug7\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\debug7\build\libquickstep\"
-				ObjectFile="..\..\out\debug7\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\debug7\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug7\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug7\libs\libquickstep_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug7\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl7\build\libquickstep\"
-			IntermediateDirectory="..\..\out\debug_dbl7\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl7\build\libquickstep\"
-				ObjectFile="..\..\out\debug_dbl7\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl7\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl7\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeMacros.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/7/wksbullet.sln

@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAll
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBenchmarks", "appBenchmarks.vcproj", "{67034B5D-16DD-DC97-82F6-23B9E6108940}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}"
@@ -48,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytrace
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
@@ -58,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboxbox", "libboxbox.vcproj", "{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBulletColladaConverter", "libBulletColladaConverter.vcproj", "{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
@@ -86,8 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -111,6 +111,11 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -233,6 +238,11 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -245,86 +255,86 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.14 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -343,6 +353,14 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Debug.Build.0 = Debug|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.ActiveCfg = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.Build.0 = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.ActiveCfg = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.Build.0 = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -519,6 +537,14 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.Debug.Build.0 = Debug|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.ActiveCfg = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.Build.0 = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.ActiveCfg = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.Build.0 = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -559,14 +585,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.ActiveCfg = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.Build.0 = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.ActiveCfg = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.Build.0 = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.ActiveCfg = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.Build.0 = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -671,14 +689,6 @@ Global
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Debug.Build.0 = Debug|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.ActiveCfg = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.Build.0 = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.ActiveCfg = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.Build.0 = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

msvc/71/appAllBulletDemos.vcproj

@@ -300,6 +300,9 @@
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\Benchmarks\BenchmarkDemo.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
 			</File>

msvc/71/appSoftBodyDemo.vcproj

@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="appSoftBodyDemo"
+	ProjectGUID="{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release71\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\release71\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\release71\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\release71\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\release71\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\release71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseSoftBodyDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release71\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl71\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\release_dbl71\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\release_dbl71\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\release_dbl71\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\release_dbl71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblSoftBodyDemo.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug71\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\debug71\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\debug71\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\debug71\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\debug71\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\debug71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugSoftBodyDemo.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug71\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl71\build\appSoftBodyDemo\"
+			IntermediateDirectory="..\..\out\debug_dbl71\build\appSoftBodyDemo\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl71\build\appSoftBodyDemo\"
+				ObjectFile="..\..\out\debug_dbl71\build\appSoftBodyDemo\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblSoftBodyDemo.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl71\build\appSoftBodyDemo\SoftBodyDemo.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\SoftDemo\main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath="..\..\msvc\appSoftBodyDemo.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

msvc/71/libboxbox.vcproj

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="libboxbox"
-	ProjectGUID="{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release71\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release71\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release71\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release71\build\libboxbox\"
-				ObjectFile="..\..\out\release71\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release71\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release71\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release71\libs\libboxbox.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release71\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl71\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release_dbl71\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release_dbl71\build\libboxbox\"
-				ObjectFile="..\..\out\release_dbl71\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release_dbl71\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl71\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl71\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug71\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug71\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug71\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug71\build\libboxbox\"
-				ObjectFile="..\..\out\debug71\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug71\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug71\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug71\libs\libboxbox_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug71\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl71\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug_dbl71\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl71\build\libboxbox\"
-				ObjectFile="..\..\out\debug_dbl71\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl71\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl71\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/71/libbulletcollision.vcproj

@@ -307,6 +307,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp">
 			</File>
@@ -451,6 +457,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp">
 			</File>
@@ -503,6 +512,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
 			</File>
@@ -665,6 +680,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.h">
 			</File>

msvc/71/libbulletdynamics.vcproj

@@ -298,6 +298,18 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
 			</File>
@@ -307,6 +319,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
@@ -325,6 +340,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -356,6 +377,24 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h">
 			</File>
@@ -371,6 +410,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
@@ -389,6 +431,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSparseSDF.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>

msvc/71/libbulletmath.vcproj

@@ -314,6 +314,9 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>
+			<File
+				RelativePath="..\..\src\LinearMath\btHashMap.h">
+			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
@@ -359,9 +362,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btTypedUserInfo.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>

msvc/71/libquickstep.vcproj

@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="libquickstep"
-	ProjectGUID="{D7036964-B44D-8207-0ACC-D838D0BDA379}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release71\build\libquickstep\"
-			IntermediateDirectory="..\..\out\release71\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release71\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\release71\build\libquickstep\"
-				ObjectFile="..\..\out\release71\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\release71\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release71\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release71\libs\libquickstep.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release71\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl71\build\libquickstep\"
-			IntermediateDirectory="..\..\out\release_dbl71\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\release_dbl71\build\libquickstep\"
-				ObjectFile="..\..\out\release_dbl71\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\release_dbl71\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl71\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl71\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug71\build\libquickstep\"
-			IntermediateDirectory="..\..\out\debug71\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug71\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\debug71\build\libquickstep\"
-				ObjectFile="..\..\out\debug71\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\debug71\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug71\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug71\libs\libquickstep_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug71\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl71\build\libquickstep\"
-			IntermediateDirectory="..\..\out\debug_dbl71\build\libquickstep\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libquickstep\libquickstep.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl71\build\libquickstep\"
-				ObjectFile="..\..\out\debug_dbl71\build\libquickstep\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\libquickstep\quickstep.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl71\build\libquickstep\quickstep.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl71\build\libquickstep\libquickstep.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeMacros.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/71/wksbullet.sln

@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAll
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBenchmarks", "appBenchmarks.vcproj", "{67034B5D-16DD-DC97-82F6-23B9E6108940}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}"
@@ -48,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytrace
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
@@ -58,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboxbox", "libboxbox.vcproj", "{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBulletColladaConverter", "libBulletColladaConverter.vcproj", "{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
@@ -86,8 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -111,6 +111,11 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -233,6 +238,11 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -245,86 +255,86 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.14 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -343,6 +353,14 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Debug.Build.0 = Debug|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.ActiveCfg = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.Build.0 = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.ActiveCfg = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.Build.0 = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -519,6 +537,14 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.Debug.Build.0 = Debug|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.ActiveCfg = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.Build.0 = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.ActiveCfg = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.Build.0 = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -559,14 +585,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.ActiveCfg = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.Build.0 = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.ActiveCfg = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.Build.0 = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.ActiveCfg = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.Build.0 = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -671,14 +689,6 @@ Global
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Debug.Build.0 = Debug|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.ActiveCfg = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.Build.0 = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.ActiveCfg = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.Build.0 = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

msvc/8/appAllBulletDemos.vcproj

@@ -300,6 +300,9 @@
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\Benchmarks\BenchmarkDemo.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
 			</File>

msvc/8/appSoftBodyDemo.vcproj

@@ -2,8 +2,8 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="libquickstep"
+	Name="appSoftBodyDemo"
-	ProjectGUID="{D7036964-B44D-8207-0ACC-D838D0BDA379}"
+	ProjectGUID="{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -13,9 +13,11 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\out\release8\build\libquickstep\"
+			OutputDirectory="..\..\out\release8\build\appSoftBodyDemo\"
-			IntermediateDirectory="..\..\out\release8\build\libquickstep\"
+			IntermediateDirectory="..\..\out\release8\build\appSoftBodyDemo\"
-			ConfigurationType="4"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
@@ -26,15 +28,15 @@
 				RuntimeLibrary="0"
 				DebugInformationFormat="3"
 				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
-				PrecompiledHeaderFile="..\..\out\release8\build\libquickstep\libquickstep.pch"
+				PrecompiledHeaderFile="..\..\out\release8\build\appSoftBodyDemo\appSoftBodyDemo.pch"
-				AssemblerListingLocation="..\..\out\release8\build\libquickstep\"
+				AssemblerListingLocation="..\..\out\release8\build\appSoftBodyDemo\"
-				ObjectFile="..\..\out\release8\build\libquickstep\"
+				ObjectFile="..\..\out\release8\build\appSoftBodyDemo\"
-				ProgramDataBaseFileName="..\..\out\release8\build\libquickstep\quickstep.pdb"
+				ProgramDataBaseFileName="..\..\out\release8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -49,25 +51,26 @@
 				EnableCOMDATFolding="2"
 				GenerateDebugInformation="TRUE"
 				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseSoftBodyDemo.exe"
+				SubSystem="1"
 				AdditionalOptions=" "
-				AdditionalDependencies=""
+				AdditionalDependencies="glut32.lib"
 				IgnoreImportLibrary="TRUE"
 				SuppressStartupBanner="TRUE"
 				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\Glut"
-				ProgramDatabaseFile="..\..\out\release8\build\libquickstep\quickstep.pdb"
+				ProgramDatabaseFile="..\..\out\release8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release8\libs\libquickstep.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release8\build\libquickstep\libquickstep.tlb"/>
+				TypeLibraryName="..\..\out\release8\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -76,8 +79,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -86,22 +89,23 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl8\build\libquickstep\"
+			OutputDirectory="..\..\out\release_dbl8\build\appSoftBodyDemo\"
-			IntermediateDirectory="..\..\out\release_dbl8\build\libquickstep\"
+			IntermediateDirectory="..\..\out\release_dbl8\build\appSoftBodyDemo\"
-			ConfigurationType="4"
+			ConfigurationType="1"
+			CharacterSet="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
-				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libquickstep\libquickstep.pch"
+				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.pch"
-				AssemblerListingLocation="..\..\out\release_dbl8\build\libquickstep\"
+				AssemblerListingLocation="..\..\out\release_dbl8\build\appSoftBodyDemo\"
-				ObjectFile="..\..\out\release_dbl8\build\libquickstep\"
+				ObjectFile="..\..\out\release_dbl8\build\appSoftBodyDemo\"
-				ProgramDataBaseFileName="..\..\out\release_dbl8\build\libquickstep\quickstep.pdb"
+				ProgramDataBaseFileName="..\..\out\release_dbl8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -111,24 +115,26 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblSoftBodyDemo.exe"
+                                SubSystem="1"
 				AdditionalOptions=" "
-				AdditionalDependencies=""
+				AdditionalDependencies="glut32.lib"
 				IgnoreImportLibrary="TRUE"
 				SuppressStartupBanner="TRUE"
 				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\Glut"
-				ProgramDatabaseFile="..\..\out\release_dbl8\build\libquickstep\quickstep.pdb"
+				ProgramDatabaseFile="..\..\out\release_dbl8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl8\build\libquickstep\libquickstep.tlb"/>
+				TypeLibraryName="..\..\out\release_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -137,8 +143,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -147,9 +153,10 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug8\build\libquickstep\"
+			OutputDirectory="..\..\out\debug8\build\appSoftBodyDemo\"
-			IntermediateDirectory="..\..\out\debug8\build\libquickstep\"
+			IntermediateDirectory="..\..\out\debug8\build\appSoftBodyDemo\"
-			ConfigurationType="4"
+			ConfigurationType="1"
+			CharacterSet="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
@@ -159,15 +166,15 @@
 				DebugInformationFormat="4"
 				RuntimeTypeInfo="FALSE"
 				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
-				PrecompiledHeaderFile="..\..\out\debug8\build\libquickstep\libquickstep.pch"
+				PrecompiledHeaderFile="..\..\out\debug8\build\appSoftBodyDemo\appSoftBodyDemo.pch"
-				AssemblerListingLocation="..\..\out\debug8\build\libquickstep\"
+				AssemblerListingLocation="..\..\out\debug8\build\appSoftBodyDemo\"
-				ObjectFile="..\..\out\debug8\build\libquickstep\"
+				ObjectFile="..\..\out\debug8\build\appSoftBodyDemo\"
-				ProgramDataBaseFileName="..\..\out\debug8\build\libquickstep\quickstep.pdb"
+				ProgramDataBaseFileName="..\..\out\debug8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -180,25 +187,26 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
 				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugSoftBodyDemo.exe"
+				SubSystem="1"
 				AdditionalOptions=" "
-				AdditionalDependencies=""
+				AdditionalDependencies="glut32.lib"
 				IgnoreImportLibrary="TRUE"
 				SuppressStartupBanner="TRUE"
 				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\Glut"
-				ProgramDatabaseFile="..\..\out\debug8\build\libquickstep\quickstep.pdb"
+				ProgramDatabaseFile="..\..\out\debug8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug8\libs\libquickstep_d.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug8\build\libquickstep\libquickstep.tlb"/>
+				TypeLibraryName="..\..\out\debug8\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -207,8 +215,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -217,9 +225,10 @@
 		</Configuration>
 		<Configuration
 			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl8\build\libquickstep\"
+			OutputDirectory="..\..\out\debug_dbl8\build\appSoftBodyDemo\"
-			IntermediateDirectory="..\..\out\debug_dbl8\build\libquickstep\"
+			IntermediateDirectory="..\..\out\debug_dbl8\build\appSoftBodyDemo\"
-			ConfigurationType="4"
+			ConfigurationType="1"
+			CharacterSet="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
@@ -229,15 +238,15 @@
                                 DebugInformationFormat="4"
                                 RuntimeTypeInfo="FALSE"
                                 RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
-				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libquickstep\libquickstep.pch"
+				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl8\build\libquickstep\"
+				AssemblerListingLocation="..\..\out\debug_dbl8\build\appSoftBodyDemo\"
-				ObjectFile="..\..\out\debug_dbl8\build\libquickstep\"
+				ObjectFile="..\..\out\debug_dbl8\build\appSoftBodyDemo\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\libquickstep\quickstep.pdb"
+				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -247,24 +256,26 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblSoftBodyDemo.exe"
+                                SubSystem="1"
 				AdditionalOptions=" "
-				AdditionalDependencies=""
+				AdditionalDependencies="glut32.lib"
 				IgnoreImportLibrary="TRUE"
 				SuppressStartupBanner="TRUE"
 				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\Glut"
-				ProgramDatabaseFile="..\..\out\debug_dbl8\build\libquickstep\quickstep.pdb"
+				ProgramDatabaseFile="..\..\out\debug_dbl8\build\appSoftBodyDemo\SoftBodyDemo.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl8\build\libquickstep\libquickstep.tlb"/>
+				TypeLibraryName="..\..\out\debug_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -273,8 +284,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -287,47 +298,24 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.cpp">
+				RelativePath="..\..\Demos\SoftDemo\main.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.cpp">
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.h">
+				RelativePath="..\..\Demos\SoftDemo\SoftDemo.h">
 			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
 			<File
-				RelativePath="..\..\Extras\quickstep\OdeContactJoint.h">
+				RelativePath="..\..\msvc\appSoftBodyDemo.rc">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeMacros.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeSolverBody.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\OdeTypedJoint.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\quickstep\SorLcp.h">
 			</File>
 		</Filter>
 	</Files>

msvc/8/libboxbox.vcproj

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libboxbox"
-	ProjectGUID="{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release8\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release8\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release8\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release8\build\libboxbox\"
-				ObjectFile="..\..\out\release8\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release8\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release8\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release8\libs\libboxbox.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release8\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl8\build\libboxbox\"
-			IntermediateDirectory="..\..\out\release_dbl8\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\release_dbl8\build\libboxbox\"
-				ObjectFile="..\..\out\release_dbl8\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\release_dbl8\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl8\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl8\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug8\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug8\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug8\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug8\build\libboxbox\"
-				ObjectFile="..\..\out\debug8\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug8\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug8\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug8\libs\libboxbox_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug8\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl8\build\libboxbox\"
-			IntermediateDirectory="..\..\out\debug_dbl8\build\libboxbox\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libboxbox\libboxbox.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl8\build\libboxbox\"
-				ObjectFile="..\..\out\debug_dbl8\build\libboxbox\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\libboxbox\boxbox.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl8\build\libboxbox\boxbox.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl8\build\libboxbox\libboxbox.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Extras\AlternativeCollisionAlgorithms\BoxBoxDetector.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/8/libbulletcollision.vcproj

@@ -307,6 +307,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp">
 			</File>
@@ -451,6 +457,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp">
 			</File>
@@ -503,6 +512,12 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
 			</File>
@@ -665,6 +680,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.h">
 			</File>

msvc/8/libbulletdynamics.vcproj

@@ -298,6 +298,18 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
 			</File>
@@ -307,6 +319,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
@@ -325,6 +340,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -356,6 +377,24 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.h">
 			</File>
@@ -371,6 +410,9 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
@@ -389,6 +431,12 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSoftBody.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\SoftBody\btSparseSDF.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>

msvc/8/libbulletmath.vcproj

@@ -314,6 +314,9 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>
+			<File
+				RelativePath="..\..\src\LinearMath\btHashMap.h">
+			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
@@ -359,9 +362,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btTypedUserInfo.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>

msvc/8/wksbullet.sln

@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAll
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBenchmarks", "appBenchmarks.vcproj", "{67034B5D-16DD-DC97-82F6-23B9E6108940}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}"
@@ -48,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytrace
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
@@ -58,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_b
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboxbox", "libboxbox.vcproj", "{B6257B39-1C3C-09FF-BD85-AAC75B140A19}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBulletColladaConverter", "libBulletColladaConverter.vcproj", "{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
@@ -86,8 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -111,6 +111,11 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -233,6 +238,11 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -245,86 +255,86 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.36 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {2D714360-B8EC-F8E0-ED74-E95336301075}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {2D714360-B8EC-F8E0-ED74-E95336301075}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {6D016A7B-39C8-2018-733F-22921BE94AC4}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.25 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.26 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.14 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -343,6 +353,14 @@ Global
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Debug.Build.0 = Debug|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.ActiveCfg = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Release.Build.0 = Release|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.ActiveCfg = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.Debug.Build.0 = Debug|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -519,6 +537,14 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.Debug.Build.0 = Debug|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.ActiveCfg = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Release.Build.0 = Release|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.ActiveCfg = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.Debug.Build.0 = Debug|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -559,14 +585,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.ActiveCfg = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Release.Build.0 = Release|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.ActiveCfg = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.Debug.Build.0 = Debug|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{B6257B39-1C3C-09FF-BD85-AAC75B140A19}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.ActiveCfg = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.Release.Build.0 = Release|Win32
 		{ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -671,14 +689,6 @@ Global
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Debug.Build.0 = Debug|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.ActiveCfg = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Release.Build.0 = Release|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.ActiveCfg = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.Debug.Build.0 = Debug|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{D7036964-B44D-8207-0ACC-D838D0BDA379}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

msvc/appSoftBodyDemo.rc

@@ -0,0 +1,30 @@
+// This file is generated automatically.
+
+1 VERSIONINFO
+FILEVERSION 2, 67, 0, 0
+PRODUCTVERSION 2, 67, 0, 0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+  BLOCK "StringFileInfo"
+  {
+    BLOCK "040904E4"
+    {
+      VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
+      VALUE "ProductVersion", "2.67"
+      VALUE "FileVersion", "2.67"
+      VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
+      VALUE "FileDescription", "SoftBodyDemo"
+#ifdef CS_DEBUG
+      VALUE "Comments", "Debug build"
+#else
+      VALUE "Comments", "Release build"
+#endif
+      VALUE "WWW", "http://www.bulletphysics.com"
+    }
+  }
+}
+1 ICON "../../msvc/bullet_ico.ico"