diff --git a/msvc/6/appBasicSample.dsp b/msvc/6/appBasicSample.dsp
index 43847a960..b5956c617 100644
--- a/msvc/6/appBasicSample.dsp
+++ b/msvc/6/appBasicSample.dsp
@@ -1,278 +1,139 @@
 # Microsoft Developer Studio Project File - Name="appBasicSample" - Package Owner=<4>
-
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-
 # ** DO NOT EDIT **
 
-
-
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-
-
 CFG=appBasicSample - 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 "appBasicSample.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 "appBasicSample.mak" CFG="appBasicSample - Win32 Release"
-
 !MESSAGE 
-
 !MESSAGE Possible choices for configuration are:
-
 !MESSAGE 
-
 !MESSAGE "appBasicSample - Win32 Debug" (based on "Win32 (x86) Console Application")
-
 !MESSAGE "appBasicSample - 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)" == "appBasicSample - 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\appBasicSample\"
-
 # PROP Intermediate_Dir "..\..\out\release6\build\appBasicSample\"
-
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appBasicSample\appBasicSample.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appBasicSample\appBasicSample.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 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 /OPT:NOREF /out:"..\..\BasicSample.exe" /subsystem:console  
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ELSEIF  "$(CFG)" == "appBasicSample - 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\appBasicSample\"
-
 # PROP Intermediate_Dir "..\..\out\debug6\build\appBasicSample\"
-
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appBasicSample\appBasicSample.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appBasicSample\appBasicSample.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 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 /debug /pdbtype:sept /out:"..\..\BasicSample.exe" /subsystem:console  
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ENDIF 
 
-
-
 # Begin Target
 
-
-
 # Name "appBasicSample - Win32 Release"
-
 # Name "appBasicSample - Win32 Debug"
-
 # Begin Group "Source Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\BasicSample\BasicSample.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\BasicSample\MyMotionState.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\BasicSample\PrintfDebugDrawer.cpp
-
 # End Source File
-
 # End Group
-
 # Begin Group "Header Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\BasicSample\MyMotionState.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\BasicSample\PrintfDebugDrawer.h
-
 # End Source File
-
 # End Group
-
 # Begin Group "Resource Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\msvc\appBasicSample.rc
-
 # End Source File
-
 # End Group
-
 # End Target
-
 # End Project
-
diff --git a/msvc/6/appCcdPhysicsDemo.dsp b/msvc/6/appCcdPhysicsDemo.dsp
index 61b43f986..b82ef77bf 100644
--- a/msvc/6/appCcdPhysicsDemo.dsp
+++ b/msvc/6/appCcdPhysicsDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appCollisionDemo.dsp b/msvc/6/appCollisionDemo.dsp
index 730f1e7fa..19d054b6e 100644
--- a/msvc/6/appCollisionDemo.dsp
+++ b/msvc/6/appCollisionDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appCollisionInterfaceDemo.dsp b/msvc/6/appCollisionInterfaceDemo.dsp
index 86bc6d427..ac55f0201 100644
--- a/msvc/6/appCollisionInterfaceDemo.dsp
+++ b/msvc/6/appCollisionInterfaceDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appConcaveDemo.dsp b/msvc/6/appConcaveDemo.dsp
index 9476d52a9..66e6cdeaa 100644
--- a/msvc/6/appConcaveDemo.dsp
+++ b/msvc/6/appConcaveDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appConstraintDemo.dsp b/msvc/6/appConstraintDemo.dsp
index 3625362aa..9e98618f3 100644
--- a/msvc/6/appConstraintDemo.dsp
+++ b/msvc/6/appConstraintDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appContinuousConvexCollision.dsp b/msvc/6/appContinuousConvexCollision.dsp
index e41cdd82d..93a80f30b 100644
--- a/msvc/6/appContinuousConvexCollision.dsp
+++ b/msvc/6/appContinuousConvexCollision.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appEPAPenDepthDemo.dsp b/msvc/6/appEPAPenDepthDemo.dsp
index 37e842437..c633fe3de 100644
--- a/msvc/6/appEPAPenDepthDemo.dsp
+++ b/msvc/6/appEPAPenDepthDemo.dsp
@@ -1,238 +1,119 @@
 # Microsoft Developer Studio Project File - Name="appEPAPenDepthDemo" - Package Owner=<4>
-
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-
 # ** DO NOT EDIT **
 
-
-
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-
-
 CFG=appEPAPenDepthDemo - 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 "appEPAPenDepthDemo.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 "appEPAPenDepthDemo.mak" CFG="appEPAPenDepthDemo - Win32 Release"
-
 !MESSAGE 
-
 !MESSAGE Possible choices for configuration are:
-
 !MESSAGE 
-
 !MESSAGE "appEPAPenDepthDemo - Win32 Debug" (based on "Win32 (x86) Console Application")
-
 !MESSAGE "appEPAPenDepthDemo - 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)" == "appEPAPenDepthDemo - 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\appEPAPenDepthDemo\"
-
 # PROP Intermediate_Dir "..\..\out\release6\build\appEPAPenDepthDemo\"
-
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 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:"..\..\EPAPenDepthDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ELSEIF  "$(CFG)" == "appEPAPenDepthDemo - 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\appEPAPenDepthDemo\"
-
 # PROP Intermediate_Dir "..\..\out\debug6\build\appEPAPenDepthDemo\"
-
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
-
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 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:"..\..\EPAPenDepthDemo.exe" /subsystem:console /libpath:"..\..\Glut" 
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ENDIF 
 
-
-
 # Begin Target
 
-
-
 # Name "appEPAPenDepthDemo - Win32 Release"
-
 # Name "appEPAPenDepthDemo - Win32 Debug"
-
 # Begin Group "Source Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\Demos\EPAPenDepthDemo\EpaPenDepthDemo.cpp
-
 # End Source File
-
 # End Group
-
 # Begin Group "Resource Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\msvc\appEPAPenDepthDemo.rc
-
 # End Source File
-
 # End Group
-
 # End Target
-
 # End Project
-
diff --git a/msvc/6/appGjkConvexCastDemo.dsp b/msvc/6/appGjkConvexCastDemo.dsp
index 7657d1d2d..ed3a1ed3b 100644
--- a/msvc/6/appGjkConvexCastDemo.dsp
+++ b/msvc/6/appGjkConvexCastDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appRaytracer.dsp b/msvc/6/appRaytracer.dsp
index 77bb383ec..75e48de24 100644
--- a/msvc/6/appRaytracer.dsp
+++ b/msvc/6/appRaytracer.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/appSimplexDemo.dsp b/msvc/6/appSimplexDemo.dsp
index 0500a830f..bedf5b624 100644
--- a/msvc/6/appSimplexDemo.dsp
+++ b/msvc/6/appSimplexDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
 # 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\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/grpapps_bullet.dsp b/msvc/6/grpapps_bullet.dsp
index 9fa7e6ade..0d2360a09 100644
--- a/msvc/6/grpapps_bullet.dsp
+++ b/msvc/6/grpapps_bullet.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp
index ebd574c3a..5c6e5c00d 100644
--- a/msvc/6/libbulletmath.dsp
+++ b/msvc/6/libbulletmath.dsp
@@ -1,462 +1,231 @@
 # Microsoft Developer Studio Project File - Name="libbulletmath" - Package Owner=<4>
-
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-
 # ** DO NOT EDIT **
 
-
-
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-
-
 CFG=libbulletmath - 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 "libbulletmath.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 "libbulletmath.mak" CFG="libbulletmath - Win32 Release"
-
 !MESSAGE 
-
 !MESSAGE Possible choices for configuration are:
-
 !MESSAGE 
-
 !MESSAGE "libbulletmath - Win32 Debug" (based on "Win32 (x86) Static Library")
-
 !MESSAGE "libbulletmath - 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)" == "libbulletmath - 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\libbulletmath\"
-
 # PROP Intermediate_Dir "..\..\out\release6\build\libbulletmath\"
-
 # 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 /GX /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 "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath"
-
 # 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\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath"
-
 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\libbulletmath.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  
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ELSEIF  "$(CFG)" == "libbulletmath - 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\libbulletmath\"
-
 # PROP Intermediate_Dir "..\..\out\debug6\build\libbulletmath\"
-
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath"
-
 # 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\libbulletmath\libbulletmath.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath"
-
 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\libbulletmath_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  
-
 # Begin Special Build Tool
-
 SOURCE="$(InputPath)"
-
 # End Special Build Tool
 
-
-
 !ENDIF 
 
-
-
 # Begin Target
 
-
-
 # Name "libbulletmath - Win32 Release"
-
 # Name "libbulletmath - Win32 Debug"
-
 # Begin Group "Source Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Geometry.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Matrix.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Quat.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\quickprof.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Scalar.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Vector.cpp
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\VectorBase.cpp
-
 # End Source File
-
 # End Group
-
 # Begin Group "Header Files"
 
-
-
 # PROP Default_Filter ""
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\AabbUtil2.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\GEN_List.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\GEN_MinMax.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\GEN_random.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Geometry.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\IDebugDraw.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Maths.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Matrix.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Memory2.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Quat.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\quickprof.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Scalar.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdMatrix3x3.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdMinMax.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdPoint3.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdQuadWord.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdQuaternion.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdScalar.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdTransform.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdTransformUtil.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\SimdVector3.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\Vector.h
-
 # End Source File
-
 # Begin Source File
 
-
-
 SOURCE=..\..\LinearMath\VectorBase.h
-
 # End Source File
-
 # End Group
-
 # End Target
-
 # End Project
-
diff --git a/msvc/6/libbulletopenglsupport.dsp b/msvc/6/libbulletopenglsupport.dsp
index dc750cc86..5f621a254 100644
--- a/msvc/6/libbulletopenglsupport.dsp
+++ b/msvc/6/libbulletopenglsupport.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # 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 /GX /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 "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /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 "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut"
 # 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\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # 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 /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /GX /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Glut"
 # 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\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index a116f0646..5c1d4a208 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -60,6 +60,36 @@ Package=<4>
 
 ###############################################################################
 
+Project: "appColladaDemo"=.\appColladaDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libbullet
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletccdphysics
+    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 libbulletphysicsinterfacecommon
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "appCollisionDemo"=.\appCollisionDemo.dsp - Package Owner=<4>
 
 Package=<5>
@@ -210,6 +240,39 @@ Package=<4>
 
 ###############################################################################
 
+Project: "appConvexDecompositionDemo"=.\appConvexDecompositionDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libbullet
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletccdphysics
+    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 libbulletphysicsinterfacecommon
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libconvexdecomposition
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "appEPAPenDepthDemo"=.\appEPAPenDepthDemo.dsp - Package Owner=<4>
 
 Package=<5>
@@ -345,6 +408,9 @@ Package=<4>
     Project_Dep_Name appCcdPhysicsDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appColladaDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appCollisionDemo
     End Project Dependency
     Begin Project Dependency
@@ -360,6 +426,9 @@ Package=<4>
     Project_Dep_Name appContinuousConvexCollision
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appConvexDecompositionDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appEPAPenDepthDemo
     End Project Dependency
     Begin Project Dependency
@@ -389,6 +458,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libbulletphysicsinterfacecommon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libconvexdecomposition
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -408,6 +480,9 @@ Package=<4>
     Project_Dep_Name appCcdPhysicsDemo
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appColladaDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appCollisionDemo
     End Project Dependency
     Begin Project Dependency
@@ -423,6 +498,9 @@ Package=<4>
     Project_Dep_Name appContinuousConvexCollision
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name appConvexDecompositionDemo
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name appEPAPenDepthDemo
     End Project Dependency
     Begin Project Dependency
@@ -464,6 +542,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libbulletphysicsinterfacecommon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libconvexdecomposition
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -540,6 +621,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libconvexdecomposition"=.\libconvexdecomposition.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/msvc/7/appBasicSample.vcproj b/msvc/7/appBasicSample.vcproj
index b6dfb8753..a69769d40 100644
--- a/msvc/7/appBasicSample.vcproj
+++ b/msvc/7/appBasicSample.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appBasicSample\appBasicSample.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appBasicSample\"
 				ObjectFile="..\..\out\release7\build\appBasicSample\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appBasicSample\appBasicSample.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appBasicSample\"
 				ObjectFile="..\..\out\debug7\build\appBasicSample\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appCcdPhysicsDemo.vcproj b/msvc/7/appCcdPhysicsDemo.vcproj
index 04ca9c278..601460e9a 100644
--- a/msvc/7/appCcdPhysicsDemo.vcproj
+++ b/msvc/7/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release7\build\appCcdPhysicsDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug7\build\appCcdPhysicsDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appCollisionDemo.vcproj b/msvc/7/appCollisionDemo.vcproj
index 8fbc20017..d1357dd8b 100644
--- a/msvc/7/appCollisionDemo.vcproj
+++ b/msvc/7/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release7\build\appCollisionDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug7\build\appCollisionDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appCollisionInterfaceDemo.vcproj b/msvc/7/appCollisionInterfaceDemo.vcproj
index 9885f2c02..fd276f101 100644
--- a/msvc/7/appCollisionInterfaceDemo.vcproj
+++ b/msvc/7/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release7\build\appCollisionInterfaceDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug7\build\appCollisionInterfaceDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appConcaveDemo.vcproj b/msvc/7/appConcaveDemo.vcproj
index 190f709d2..315e70746 100644
--- a/msvc/7/appConcaveDemo.vcproj
+++ b/msvc/7/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release7\build\appConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug7\build\appConcaveDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appConstraintDemo.vcproj b/msvc/7/appConstraintDemo.vcproj
index b31d22a40..3c70575fb 100644
--- a/msvc/7/appConstraintDemo.vcproj
+++ b/msvc/7/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release7\build\appConstraintDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug7\build\appConstraintDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appContinuousConvexCollision.vcproj b/msvc/7/appContinuousConvexCollision.vcproj
index b2d99cd82..5a57c3f28 100644
--- a/msvc/7/appContinuousConvexCollision.vcproj
+++ b/msvc/7/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release7\build\appContinuousConvexCollision\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug7\build\appContinuousConvexCollision\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appEPAPenDepthDemo.vcproj b/msvc/7/appEPAPenDepthDemo.vcproj
index ac5f9c3d5..742a04660 100644
--- a/msvc/7/appEPAPenDepthDemo.vcproj
+++ b/msvc/7/appEPAPenDepthDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release7\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug7\build\appEPAPenDepthDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appGjkConvexCastDemo.vcproj b/msvc/7/appGjkConvexCastDemo.vcproj
index e7aec9050..596a7e5b1 100644
--- a/msvc/7/appGjkConvexCastDemo.vcproj
+++ b/msvc/7/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release7\build\appGjkConvexCastDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug7\build\appGjkConvexCastDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appRaytracer.vcproj b/msvc/7/appRaytracer.vcproj
index dece16f2d..c5e44adbe 100644
--- a/msvc/7/appRaytracer.vcproj
+++ b/msvc/7/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appRaytracer\"
 				ObjectFile="..\..\out\release7\build\appRaytracer\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appRaytracer\"
 				ObjectFile="..\..\out\debug7\build\appRaytracer\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/appSimplexDemo.vcproj b/msvc/7/appSimplexDemo.vcproj
index 97faae40b..526244f6b 100644
--- a/msvc/7/appSimplexDemo.vcproj
+++ b/msvc/7/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release7\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release7\build\appSimplexDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug7\build\appSimplexDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/grpapps_bullet.vcproj b/msvc/7/grpapps_bullet.vcproj
index d5d72a2fb..0463c2c96 100644
--- a/msvc/7/grpapps_bullet.vcproj
+++ b/msvc/7/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release7\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release7\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release7\build\grpapps_bullet\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug7\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug7\build\grpapps_bullet\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/libbulletopenglsupport.vcproj b/msvc/7/libbulletopenglsupport.vcproj
index bcd08a21c..7d1885a96 100644
--- a/msvc/7/libbulletopenglsupport.vcproj
+++ b/msvc/7/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release7\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release7\build\libbulletopenglsupport\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug7\build\libbulletopenglsupport\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln
index d05d15bb3..d5d2a1d12 100644
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicSample", "appBasicS
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionDemo", "appCollisionDemo.vcproj", "{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionInterfaceDemo", "appCollisionInterfaceDemo.vcproj", "{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}"
@@ -14,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConstraintDemo", "appCon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollision", "appContinuousConvexCollision.vcproj", "{801CB6D4-A45C-C9D2-B176-9711A74B9164}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
@@ -40,6 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -57,6 +63,12 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -87,6 +99,13 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -113,38 +132,44 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{A584DCA6-74CD-02E3-E473-0D9990CD9A84}.Release.ActiveCfg = Release|Win32
@@ -155,6 +180,10 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.Build.0 = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.ActiveCfg = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.Build.0 = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.ActiveCfg = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.Build.0 = Debug|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.ActiveCfg = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.Build.0 = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Debug.ActiveCfg = Debug|Win32
@@ -175,6 +204,10 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Release.Build.0 = Release|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.ActiveCfg = Debug|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.Build.0 = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.ActiveCfg = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.ActiveCfg = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.Build.0 = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.ActiveCfg = Debug|Win32
@@ -227,6 +260,10 @@ Global
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/71/appCcdPhysicsDemo.vcproj b/msvc/71/appCcdPhysicsDemo.vcproj
index 2e0dc7951..2ab2305fe 100644
--- a/msvc/71/appCcdPhysicsDemo.vcproj
+++ b/msvc/71/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release71\build\appCcdPhysicsDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug71\build\appCcdPhysicsDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appCollisionDemo.vcproj b/msvc/71/appCollisionDemo.vcproj
index e6f62f34d..53f2a821e 100644
--- a/msvc/71/appCollisionDemo.vcproj
+++ b/msvc/71/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release71\build\appCollisionDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug71\build\appCollisionDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appCollisionInterfaceDemo.vcproj b/msvc/71/appCollisionInterfaceDemo.vcproj
index 33266bbd4..686ae698d 100644
--- a/msvc/71/appCollisionInterfaceDemo.vcproj
+++ b/msvc/71/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release71\build\appCollisionInterfaceDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug71\build\appCollisionInterfaceDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appConcaveDemo.vcproj b/msvc/71/appConcaveDemo.vcproj
index 77a4e460a..57940c216 100644
--- a/msvc/71/appConcaveDemo.vcproj
+++ b/msvc/71/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release71\build\appConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug71\build\appConcaveDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appConstraintDemo.vcproj b/msvc/71/appConstraintDemo.vcproj
index 7eeb32cb9..0f44d298c 100644
--- a/msvc/71/appConstraintDemo.vcproj
+++ b/msvc/71/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release71\build\appConstraintDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug71\build\appConstraintDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appContinuousConvexCollision.vcproj b/msvc/71/appContinuousConvexCollision.vcproj
index cd5f15286..5c10b6022 100644
--- a/msvc/71/appContinuousConvexCollision.vcproj
+++ b/msvc/71/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release71\build\appContinuousConvexCollision\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug71\build\appContinuousConvexCollision\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appEPAPenDepthDemo.vcproj b/msvc/71/appEPAPenDepthDemo.vcproj
index 2815e1856..975e686eb 100644
--- a/msvc/71/appEPAPenDepthDemo.vcproj
+++ b/msvc/71/appEPAPenDepthDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release71\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug71\build\appEPAPenDepthDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appGjkConvexCastDemo.vcproj b/msvc/71/appGjkConvexCastDemo.vcproj
index 649ecbb4e..a68989ff0 100644
--- a/msvc/71/appGjkConvexCastDemo.vcproj
+++ b/msvc/71/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release71\build\appGjkConvexCastDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug71\build\appGjkConvexCastDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appRaytracer.vcproj b/msvc/71/appRaytracer.vcproj
index 56a09ab37..9a577a11a 100644
--- a/msvc/71/appRaytracer.vcproj
+++ b/msvc/71/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appRaytracer\"
 				ObjectFile="..\..\out\release71\build\appRaytracer\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appRaytracer\"
 				ObjectFile="..\..\out\debug71\build\appRaytracer\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/appSimplexDemo.vcproj b/msvc/71/appSimplexDemo.vcproj
index 32dfe94c6..41e7edf2f 100644
--- a/msvc/71/appSimplexDemo.vcproj
+++ b/msvc/71/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release71\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release71\build\appSimplexDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug71\build\appSimplexDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/grpapps_bullet.vcproj b/msvc/71/grpapps_bullet.vcproj
index 9bc2d1323..b0ad03c2a 100644
--- a/msvc/71/grpapps_bullet.vcproj
+++ b/msvc/71/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release71\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release71\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release71\build\grpapps_bullet\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug71\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug71\build\grpapps_bullet\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/libbullet.vcproj b/msvc/71/libbullet.vcproj
index 3c3e2649f..037466615 100644
--- a/msvc/71/libbullet.vcproj
+++ b/msvc/71/libbullet.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -20,17 +20,17 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="2"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
 				AdditionalOptions=" "
+				Optimization="2"
+				OptimizeForProcessor="1"
 				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				StringPooling="TRUE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="FALSE"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbullet\libbullet.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbullet\"
 				ObjectFile="..\..\out\release71\build\libbullet\"
@@ -38,24 +38,10 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
+				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release71\build\libbullet\bullet.pdb"
-				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\release71\libs\libbullet.lib"
@@ -68,8 +54,7 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\release71\build\libbullet\libbullet.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -77,12 +62,16 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				Culture="1033"/>
+				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -93,16 +82,16 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="TRUE"
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
 				AdditionalOptions=" "
+				Optimization="0"
+				OptimizeForProcessor="1"
 				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="FALSE"
+				RuntimeTypeInfo="TRUE"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbullet\libbullet.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbullet\"
 				ObjectFile="..\..\out\debug71\build\libbullet\"
@@ -110,22 +99,10 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
+				DebugInformationFormat="4"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug71\build\libbullet\bullet.pdb"
-				TargetMachine="1"/>
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="..\..\out\debug71\libs\libbullet_d.lib"
@@ -138,8 +115,7 @@
 				TargetEnvironment="1"
 				TypeLibraryName="..\..\out\debug71\build\libbullet\libbullet.tlb"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -147,14 +123,20 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"
-				Culture="1033"/>
+				Culture="1033"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -162,98 +144,11 @@
 			<File
 				RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseProxy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Bullet\CollisionShapes\BoxShape.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConvexHullShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\MultiSphereShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\Simplex1to4Shape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleMeshShape.cpp">
+				RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseProxy.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_AlgebraicPolynomialSolver.cpp">
@@ -273,12 +168,57 @@
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ConvexCast.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConvexHullShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\Epa.cpp">
 			</File>
@@ -303,21 +243,63 @@
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ManifoldContactAddResult.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\MinkowskiPenetrationDepthSolver.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\MultiSphereShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\PersistentManifold.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\RaycastCallback.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\Shape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\Simplex1to4Shape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\SubSimplexConvexCast.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleMeshShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\VoronoiSimplexSolver.cpp">
 			</File>
@@ -328,108 +310,15 @@
 			<File
 				RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\BoxShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseInterface.h">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseProxy.h">
 			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\BoxShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\CollisionMargin.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConvexHullShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\MultiSphereShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\Simplex1to4Shape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleMeshShape.h">
-			</File>
-			<File
-				RelativePath="..\..\Bullet\CollisionShapes\TriangleShape.h">
-			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_AlgebraicPolynomialSolver.h">
 			</File>
@@ -457,21 +346,69 @@
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\BvhTriangleMeshShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\CollisionMargin.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.h">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ConvexCast.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConvexHullShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ConvexPenetrationDepthSolver.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\DiscreteCollisionDetectorInterface.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\EmptyShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\Epa.h">
 			</File>
@@ -511,31 +448,82 @@
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\ManifoldPoint.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\MinkowskiPenetrationDepthSolver.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\MinkowskiSumShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\MultiSphereShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\OptimizedBvh.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\PersistentManifold.h">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\PointCollector.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\PolyhedralConvexShape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\RaycastCallback.h">
 			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\Shape.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\Simplex1to4Shape.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\SimplexSolverInterface.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\SubSimplexConvexCast.h">
 			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleCallback.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleIndexVertexArray.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleMesh.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleMeshShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionShapes\TriangleShape.h">
+			</File>
+			<File
+				RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.h">
+			</File>
 			<File
 				RelativePath="..\..\Bullet\NarrowPhaseCollision\VoronoiSimplexSolver.h">
 			</File>
 		</Filter>
+		<File
+			RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.cpp">
+		</File>
+		<File
+			RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.h">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/msvc/71/libbulletopenglsupport.vcproj b/msvc/71/libbulletopenglsupport.vcproj
index 5b10e1806..65c1e9555 100644
--- a/msvc/71/libbulletopenglsupport.vcproj
+++ b/msvc/71/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release71\build\libbulletopenglsupport\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug71\build\libbulletopenglsupport\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln
index c83bb78d4..42fb20066 100644
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicSample", "appBasicS
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionDemo", "appCollisionDemo.vcproj", "{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionInterfaceDemo", "appCollisionInterfaceDemo.vcproj", "{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}"
@@ -14,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConstraintDemo", "appCon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollision", "appContinuousConvexCollision.vcproj", "{801CB6D4-A45C-C9D2-B176-9711A74B9164}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
@@ -40,6 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -57,6 +63,12 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -87,6 +99,13 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -113,38 +132,44 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{A584DCA6-74CD-02E3-E473-0D9990CD9A84}.Release.ActiveCfg = Release|Win32
@@ -155,6 +180,10 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.Build.0 = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.ActiveCfg = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.Build.0 = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.ActiveCfg = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.Build.0 = Debug|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.ActiveCfg = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.Build.0 = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Debug.ActiveCfg = Debug|Win32
@@ -175,6 +204,10 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Release.Build.0 = Release|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.ActiveCfg = Debug|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.Build.0 = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.ActiveCfg = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.ActiveCfg = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.Build.0 = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.ActiveCfg = Debug|Win32
@@ -227,6 +260,10 @@ Global
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/8/appBasicSample.vcproj b/msvc/8/appBasicSample.vcproj
index c676b37a7..a0cc380ab 100644
--- a/msvc/8/appBasicSample.vcproj
+++ b/msvc/8/appBasicSample.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appBasicSample\appBasicSample.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appBasicSample\"
 				ObjectFile="..\..\out\release8\build\appBasicSample\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appBasicSample\appBasicSample.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appBasicSample\"
 				ObjectFile="..\..\out\debug8\build\appBasicSample\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appCcdPhysicsDemo.vcproj b/msvc/8/appCcdPhysicsDemo.vcproj
index d38902ef5..488f9cbb5 100644
--- a/msvc/8/appCcdPhysicsDemo.vcproj
+++ b/msvc/8/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release8\build\appCcdPhysicsDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug8\build\appCcdPhysicsDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appCollisionDemo.vcproj b/msvc/8/appCollisionDemo.vcproj
index c09f3f8bb..57dc4589c 100644
--- a/msvc/8/appCollisionDemo.vcproj
+++ b/msvc/8/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release8\build\appCollisionDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug8\build\appCollisionDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appCollisionInterfaceDemo.vcproj b/msvc/8/appCollisionInterfaceDemo.vcproj
index 72d1b38de..68db23b61 100644
--- a/msvc/8/appCollisionInterfaceDemo.vcproj
+++ b/msvc/8/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release8\build\appCollisionInterfaceDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug8\build\appCollisionInterfaceDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appConcaveDemo.vcproj b/msvc/8/appConcaveDemo.vcproj
index df7b09615..3b1417816 100644
--- a/msvc/8/appConcaveDemo.vcproj
+++ b/msvc/8/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release8\build\appConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug8\build\appConcaveDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appConstraintDemo.vcproj b/msvc/8/appConstraintDemo.vcproj
index 55eb32037..d0e20371a 100644
--- a/msvc/8/appConstraintDemo.vcproj
+++ b/msvc/8/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release8\build\appConstraintDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug8\build\appConstraintDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appContinuousConvexCollision.vcproj b/msvc/8/appContinuousConvexCollision.vcproj
index 5a8da88ba..23d044089 100644
--- a/msvc/8/appContinuousConvexCollision.vcproj
+++ b/msvc/8/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release8\build\appContinuousConvexCollision\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug8\build\appContinuousConvexCollision\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appEPAPenDepthDemo.vcproj b/msvc/8/appEPAPenDepthDemo.vcproj
index ead7557c2..687ccfde4 100644
--- a/msvc/8/appEPAPenDepthDemo.vcproj
+++ b/msvc/8/appEPAPenDepthDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release8\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug8\build\appEPAPenDepthDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appGjkConvexCastDemo.vcproj b/msvc/8/appGjkConvexCastDemo.vcproj
index 950785900..1d8732f09 100644
--- a/msvc/8/appGjkConvexCastDemo.vcproj
+++ b/msvc/8/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release8\build\appGjkConvexCastDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug8\build\appGjkConvexCastDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appRaytracer.vcproj b/msvc/8/appRaytracer.vcproj
index b9f8c27a0..ac7891f70 100644
--- a/msvc/8/appRaytracer.vcproj
+++ b/msvc/8/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appRaytracer\"
 				ObjectFile="..\..\out\release8\build\appRaytracer\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appRaytracer\"
 				ObjectFile="..\..\out\debug8\build\appRaytracer\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/appSimplexDemo.vcproj b/msvc/8/appSimplexDemo.vcproj
index 0c7fc6139..a400e177f 100644
--- a/msvc/8/appSimplexDemo.vcproj
+++ b/msvc/8/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\release8\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release8\build\appSimplexDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -106,7 +106,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug8\build\appSimplexDemo\"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/grpapps_bullet.vcproj b/msvc/8/grpapps_bullet.vcproj
index b06ace9d2..fbbea13c2 100644
--- a/msvc/8/grpapps_bullet.vcproj
+++ b/msvc/8/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release8\build\grpapps_bullet\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug8\build\grpapps_bullet\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/libbulletopenglsupport.vcproj b/msvc/8/libbulletopenglsupport.vcproj
index 17a5df483..21e8f1fdb 100644
--- a/msvc/8/libbulletopenglsupport.vcproj
+++ b/msvc/8/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release8\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release8\build\libbulletopenglsupport\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug8\build\libbulletopenglsupport\"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln
index 678f55139..7f1422d7c 100644
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicSample", "appBasicS
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionDemo", "appCollisionDemo.vcproj", "{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCollisionInterfaceDemo", "appCollisionInterfaceDemo.vcproj", "{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}"
@@ -14,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConstraintDemo", "appCon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollision", "appContinuousConvexCollision.vcproj", "{801CB6D4-A45C-C9D2-B176-9711A74B9164}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
@@ -40,7 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
 EndProject
-
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -58,6 +63,12 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -88,6 +99,13 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -114,38 +132,44 @@ Global
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {A584DCA6-74CD-02E3-E473-0D9990CD9A84}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {90F5975E-550B-EEC8-9A8A-B8581D3FCF97}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{A584DCA6-74CD-02E3-E473-0D9990CD9A84}.Release.ActiveCfg = Release|Win32
@@ -156,6 +180,10 @@ Global
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32
 		{7284F809-AF30-6315-88C6-86F1C0798760}.Debug.Build.0 = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.ActiveCfg = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Release.Build.0 = Release|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.ActiveCfg = Debug|Win32
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.Debug.Build.0 = Debug|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.ActiveCfg = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Release.Build.0 = Release|Win32
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.Debug.ActiveCfg = Debug|Win32
@@ -176,6 +204,10 @@ Global
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Release.Build.0 = Release|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.ActiveCfg = Debug|Win32
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.Debug.Build.0 = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.ActiveCfg = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
+		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.ActiveCfg = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Release.Build.0 = Release|Win32
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.ActiveCfg = Debug|Win32
@@ -228,6 +260,10 @@ Global
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
 		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32
+		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection