diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp
new file mode 100644
index 000000000..67cf33d44
--- /dev/null
+++ b/msvc/6/appAllBulletDemos.dsp
@@ -0,0 +1,229 @@
+# Microsoft Developer Studio Project File - Name="appAllBulletDemos" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=appAllBulletDemos - 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 "appAllBulletDemos.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 "appAllBulletDemos.mak" CFG="appAllBulletDemos - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "appAllBulletDemos - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application")
+!MESSAGE "appAllBulletDemos - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "appAllBulletDemos - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application")
+!MESSAGE "appAllBulletDemos - 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)" == "appAllBulletDemos - 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\appAllBulletDemos\"
+# PROP Intermediate_Dir "..\..\out\release6\build\appAllBulletDemos\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL"
+# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL"
+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:"..\..\AllBulletDemos.exe" /subsystem:console /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "appAllBulletDemos - Win32 ReleaseDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "release_dbl"
+# PROP BASE Intermediate_Dir "release_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\release_dbl6\build\appAllBulletDemos\"
+# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appAllBulletDemos\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386  /out:"..\..\AllBulletDemos.exe" /subsystem:console /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "appAllBulletDemos - 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\appAllBulletDemos\"
+# PROP Intermediate_Dir "..\..\out\debug6\build\appAllBulletDemos\"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL"
+# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL"
+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:"..\..\AllBulletDemos.exe" /subsystem:console /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "appAllBulletDemos - Win32 DebugDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "debug_dbl"
+# PROP BASE Intermediate_Dir "debug_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\debug_dbl6\build\appAllBulletDemos\"
+# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appAllBulletDemos\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo 
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib  /nologo /version:4.0 /machine:I386  /out:"..\..\AllBulletDemos.exe" /subsystem:console /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "appAllBulletDemos - Win32 Release"
+# Name "appAllBulletDemos - Win32 ReleaseDoublePrecision"
+# Name "appAllBulletDemos - Win32 Debug"
+# Name "appAllBulletDemos - Win32 DebugDoublePrecision"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\..\BspDemo\BspDemo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\..\BspDemo\BspLoader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\..\CcdPhysicsDemo\CcdPhysicsDemo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\Main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\Render.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\Test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\TestEntries.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\Render.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\AllBulletDemos\Test.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\msvc\appAllBulletDemos.rc
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/msvc/6/appBasicDemo.dsp b/msvc/6/appBasicDemo.dsp
index ecb499119..bd990cdf6 100644
--- a/msvc/6/appBasicDemo.dsp
+++ b/msvc/6/appBasicDemo.dsp
@@ -172,6 +172,10 @@ SOURCE="$(InputPath)"
 
 SOURCE=..\..\Demos\BasicDemo\BasicDemo.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\BasicDemo\main.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/msvc/6/appBspDemo.dsp b/msvc/6/appBspDemo.dsp
index ea46fc608..884ff77eb 100644
--- a/msvc/6/appBspDemo.dsp
+++ b/msvc/6/appBspDemo.dsp
@@ -180,6 +180,10 @@ SOURCE=..\..\Demos\BspDemo\BspDemo.cpp
 
 SOURCE=..\..\Demos\BspDemo\BspLoader.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\BspDemo\main.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/msvc/6/appCcdPhysicsDemo.dsp b/msvc/6/appCcdPhysicsDemo.dsp
index 0c1f9b4c8..cc449c175 100644
--- a/msvc/6/appCcdPhysicsDemo.dsp
+++ b/msvc/6/appCcdPhysicsDemo.dsp
@@ -172,6 +172,10 @@ SOURCE="$(InputPath)"
 
 SOURCE=..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CcdPhysicsDemo\main.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp
index 42569fc64..ab442f544 100644
--- a/msvc/6/libbulletmath.dsp
+++ b/msvc/6/libbulletmath.dsp
@@ -256,10 +256,6 @@ SOURCE=..\..\src\LinearMath\btScalar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\btSimdMinMax.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\LinearMath\btStackAlloc.h
 # End Source File
 # Begin Source File
diff --git a/msvc/6/libglui.dsp b/msvc/6/libglui.dsp
new file mode 100644
index 000000000..4e4c75faa
--- /dev/null
+++ b/msvc/6/libglui.dsp
@@ -0,0 +1,327 @@
+# Microsoft Developer Studio Project File - Name="libglui" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libglui - 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 "libglui.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 "libglui.mak" CFG="libglui - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libglui - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library")
+!MESSAGE "libglui - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "libglui - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library")
+!MESSAGE "libglui - 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)" == "libglui - 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\libglui\"
+# PROP Intermediate_Dir "..\..\out\release6\build\libglui\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /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\libglui\libglui.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut"
+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\libglui.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 glut32.lib  /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libglui - Win32 ReleaseDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "release_dbl"
+# PROP BASE Intermediate_Dir "release_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\release_dbl6\build\libglui\"
+# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libglui\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libglui\libglui.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut"
+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  /subsystem:windows /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libglui - 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\libglui\"
+# PROP Intermediate_Dir "..\..\out\debug6\build\libglui\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /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\libglui\libglui.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut"
+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\libglui_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 glut32.lib  /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libglui - Win32 DebugDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 
+# PROP BASE Output_Dir "debug_dbl"
+# PROP BASE Intermediate_Dir "debug_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 
+# PROP Output_Dir "..\..\out\debug_dbl6\build\libglui\"
+# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libglui\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libglui\libglui.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut"
+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  /subsystem:windows /libpath:"..\..\Glut" 
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libglui - Win32 Release"
+# Name "libglui - Win32 ReleaseDoublePrecision"
+# Name "libglui - Win32 Debug"
+# Name "libglui - Win32 DebugDoublePrecision"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\algebra3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\arcball.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_add_controls.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_bitmap_img_data.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_bitmaps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_button.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_checkbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_column.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_commandline.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_control.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_edittext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_filebrowser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_listbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_mouse_iaction.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_node.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_panel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_radio.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_rollout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_rotation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_scrollbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_separator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_spinner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_statictext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_textbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_translation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_treepanel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\quaternion.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\algebra3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\arcball.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\glui_internal_control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Extras\glui\quaternion.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index c01693f2d..a5e2ad93a 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -3,6 +3,33 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
+Project: "appAllBulletDemos"=.\appAllBulletDemos.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libbulletcollision
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletdynamics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletmath
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbulletopenglsupport
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libglui
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "appBasicDemo"=.\appBasicDemo.dsp - Package Owner=<4>
 
 Package=<5>
@@ -411,18 +438,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "appGPUphysics"=.\appGPUphysics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "appMovingConcaveDemo"=.\appMovingConcaveDemo.dsp - Package Owner=<4>
 
 Package=<5>
@@ -578,6 +593,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name appAllBulletDemos
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name appBasicDemo
     End Project Dependency
@@ -627,9 +645,6 @@ Package=<4>
     Project_Dep_Name appGjkConvexCastDemo
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name appGPUphysics
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name appMovingConcaveDemo
     End Project Dependency
     Begin Project Dependency
@@ -663,9 +678,6 @@ Package=<4>
     Project_Dep_Name libbulletmath
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libbulletmultithreaded
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libbulletopenglsupport
     End Project Dependency
     Begin Project Dependency
@@ -681,6 +693,9 @@ Package=<4>
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libglui
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name liblibxml
     End Project Dependency
     Begin Project Dependency
@@ -698,6 +713,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name appAllBulletDemos
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name appBasicDemo
     End Project Dependency
@@ -747,9 +765,6 @@ Package=<4>
     Project_Dep_Name appGjkConvexCastDemo
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name appGPUphysics
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name appMovingConcaveDemo
     End Project Dependency
     Begin Project Dependency
@@ -795,9 +810,6 @@ Package=<4>
     Project_Dep_Name libbulletmath
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libbulletmultithreaded
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libbulletopenglsupport
     End Project Dependency
     Begin Project Dependency
@@ -813,6 +825,9 @@ Package=<4>
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libglui
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name liblibxml
     End Project Dependency
     Begin Project Dependency
@@ -882,18 +897,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4>
 
 Package=<5>
@@ -954,6 +957,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libglui"=.\libglui.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "liblibxml"=.\liblibxml.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/msvc/6/wksbullet_corelib.dsw b/msvc/6/wksbullet_corelib.dsw
index a36667998..747f20b6a 100644
--- a/msvc/6/wksbullet_corelib.dsw
+++ b/msvc/6/wksbullet_corelib.dsw
@@ -39,18 +39,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Global:
 
 Package=<5>
diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj
new file mode 100644
index 000000000..1291ca149
--- /dev/null
+++ b/msvc/7/appAllBulletDemos.vcproj
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="appAllBulletDemos"
+	ProjectGUID="{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release7\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release7\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release7\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release7\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release7\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release7\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl7\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release_dbl7\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release_dbl7\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release_dbl7\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release_dbl7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl7\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug7\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug7\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug7\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug7\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug7\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug7\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl7\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug_dbl7\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl7\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug_dbl7\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl7\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl7\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspLoader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\TestEntries.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath="..\..\msvc\appAllBulletDemos.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/7/appBasicDemo.vcproj b/msvc/7/appBasicDemo.vcproj
index c8d1d75c2..fbe086396 100644
--- a/msvc/7/appBasicDemo.vcproj
+++ b/msvc/7/appBasicDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BasicDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/7/appBspDemo.vcproj b/msvc/7/appBspDemo.vcproj
index aefd3aea1..1c38bb154 100644
--- a/msvc/7/appBspDemo.vcproj
+++ b/msvc/7/appBspDemo.vcproj
@@ -310,6 +310,9 @@
 			<File
 				RelativePath="..\..\Demos\BspDemo\BspLoader.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BspDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/7/appCcdPhysicsDemo.vcproj b/msvc/7/appCcdPhysicsDemo.vcproj
index 06bed8ee9..26e9b8f31 100644
--- a/msvc/7/appCcdPhysicsDemo.vcproj
+++ b/msvc/7/appCcdPhysicsDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CcdPhysicsDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj
index 9f5fc42e6..cfcd49894 100644
--- a/msvc/7/libbulletmath.vcproj
+++ b/msvc/7/libbulletmath.vcproj
@@ -358,9 +358,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btStackAlloc.h">
 			</File>
diff --git a/msvc/7/libglui.vcproj b/msvc/7/libglui.vcproj
new file mode 100644
index 000000000..8af09e714
--- /dev/null
+++ b/msvc/7/libglui.vcproj
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="libglui"
+	ProjectGUID="{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release7\build\libglui\"
+			IntermediateDirectory="..\..\out\release7\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release7\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release7\build\libglui\"
+				ObjectFile="..\..\out\release7\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release7\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release7\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\release7\libs\libglui.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release7\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl7\build\libglui\"
+			IntermediateDirectory="..\..\out\release_dbl7\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release_dbl7\build\libglui\"
+				ObjectFile="..\..\out\release_dbl7\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release_dbl7\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl7\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl7\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug7\build\libglui\"
+			IntermediateDirectory="..\..\out\debug7\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug7\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug7\build\libglui\"
+				ObjectFile="..\..\out\debug7\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug7\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug7\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\debug7\libs\libglui_d.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug7\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl7\build\libglui\"
+			IntermediateDirectory="..\..\out\debug_dbl7\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl7\build\libglui\"
+				ObjectFile="..\..\out\debug_dbl7\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl7\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl7\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_add_controls.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmap_img_data.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmaps.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_button.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_checkbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_column.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_commandline.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_control.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_edittext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_filebrowser.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_list.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_listbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_mouse_iaction.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_node.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_panel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_radio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rollout.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rotation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_scrollbar.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_separator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_spinner.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_statictext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_string.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_textbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_translation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_tree.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_treepanel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_window.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal_control.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln
index 9ecb5797b..7c522555e 100644
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
 # Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAllBulletDemos.vcproj", "{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
@@ -32,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}"
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
@@ -74,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -86,6 +86,11 @@ Global
 		ConfigName.3 = DebugDoublePrecision
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,23 +188,23 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -211,31 +216,31 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -247,16 +252,24 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.Build.0 = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.ActiveCfg = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.Build.0 = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.Build.0 = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -385,14 +398,6 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -505,14 +510,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -553,6 +550,14 @@ Global
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Debug.Build.0 = Debug|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.ActiveCfg = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.Build.0 = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.ActiveCfg = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.Build.0 = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
diff --git a/msvc/7/wksbullet_corelib.sln b/msvc/7/wksbullet_corelib.sln
index 4a03d7f86..70f6f1ee3 100644
--- a/msvc/7/wksbullet_corelib.sln
+++ b/msvc/7/wksbullet_corelib.sln
@@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -42,14 +40,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj
new file mode 100644
index 000000000..659c571c0
--- /dev/null
+++ b/msvc/71/appAllBulletDemos.vcproj
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="appAllBulletDemos"
+	ProjectGUID="{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release71\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release71\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release71\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release71\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release71\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release71\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl71\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release_dbl71\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release_dbl71\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release_dbl71\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release_dbl71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl71\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug71\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug71\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug71\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug71\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug71\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug71\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl71\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug_dbl71\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl71\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug_dbl71\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl71\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl71\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspLoader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\TestEntries.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath="..\..\msvc\appAllBulletDemos.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/71/appBasicDemo.vcproj b/msvc/71/appBasicDemo.vcproj
index 82833673a..a5734ab47 100644
--- a/msvc/71/appBasicDemo.vcproj
+++ b/msvc/71/appBasicDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BasicDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/71/appBspDemo.vcproj b/msvc/71/appBspDemo.vcproj
index 76b8e82b5..6a8ce1eec 100644
--- a/msvc/71/appBspDemo.vcproj
+++ b/msvc/71/appBspDemo.vcproj
@@ -310,6 +310,9 @@
 			<File
 				RelativePath="..\..\Demos\BspDemo\BspLoader.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BspDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/71/appCcdPhysicsDemo.vcproj b/msvc/71/appCcdPhysicsDemo.vcproj
index c3bc74d0a..4da0075a9 100644
--- a/msvc/71/appCcdPhysicsDemo.vcproj
+++ b/msvc/71/appCcdPhysicsDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CcdPhysicsDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj
index e3f72e177..fe587af8d 100644
--- a/msvc/71/libbulletmath.vcproj
+++ b/msvc/71/libbulletmath.vcproj
@@ -358,9 +358,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btStackAlloc.h">
 			</File>
diff --git a/msvc/71/libglui.vcproj b/msvc/71/libglui.vcproj
new file mode 100644
index 000000000..8bb2d9499
--- /dev/null
+++ b/msvc/71/libglui.vcproj
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libglui"
+	ProjectGUID="{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release71\build\libglui\"
+			IntermediateDirectory="..\..\out\release71\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release71\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release71\build\libglui\"
+				ObjectFile="..\..\out\release71\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release71\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release71\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\release71\libs\libglui.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release71\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl71\build\libglui\"
+			IntermediateDirectory="..\..\out\release_dbl71\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release_dbl71\build\libglui\"
+				ObjectFile="..\..\out\release_dbl71\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release_dbl71\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl71\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl71\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug71\build\libglui\"
+			IntermediateDirectory="..\..\out\debug71\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug71\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug71\build\libglui\"
+				ObjectFile="..\..\out\debug71\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug71\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug71\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\debug71\libs\libglui_d.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug71\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl71\build\libglui\"
+			IntermediateDirectory="..\..\out\debug_dbl71\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl71\build\libglui\"
+				ObjectFile="..\..\out\debug_dbl71\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl71\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl71\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_add_controls.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmap_img_data.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmaps.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_button.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_checkbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_column.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_commandline.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_control.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_edittext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_filebrowser.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_list.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_listbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_mouse_iaction.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_node.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_panel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_radio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rollout.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rotation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_scrollbar.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_separator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_spinner.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_statictext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_string.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_textbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_translation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_tree.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_treepanel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_window.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal_control.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln
index 9d6366b2f..af079fe00 100644
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 # Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAllBulletDemos.vcproj", "{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
@@ -32,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}"
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
@@ -74,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -86,6 +86,11 @@ Global
 		ConfigName.3 = DebugDoublePrecision
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,23 +188,23 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -211,31 +216,31 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -247,16 +252,24 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.Build.0 = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.ActiveCfg = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.Build.0 = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.Build.0 = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -385,14 +398,6 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -505,14 +510,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -553,6 +550,14 @@ Global
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Debug.Build.0 = Debug|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.ActiveCfg = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.Build.0 = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.ActiveCfg = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.Build.0 = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
diff --git a/msvc/71/wksbullet_corelib.sln b/msvc/71/wksbullet_corelib.sln
index b8bbbd2a0..661e5b8ca 100644
--- a/msvc/71/wksbullet_corelib.sln
+++ b/msvc/71/wksbullet_corelib.sln
@@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -42,14 +40,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj
new file mode 100644
index 000000000..1e87afbab
--- /dev/null
+++ b/msvc/8/appAllBulletDemos.vcproj
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="appAllBulletDemos"
+	ProjectGUID="{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release8\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release8\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release8\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release8\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release8\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\ReleaseAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release8\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl8\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\release_dbl8\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\release_dbl8\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\release_dbl8\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\release_dbl8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\ReleaseDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl8\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug8\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug8\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug8\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug8\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug8\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				OutputFile="..\..\DebugAllBulletDemos.exe"
+				SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug8\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl8\build\appAllBulletDemos\"
+			IntermediateDirectory="..\..\out\debug_dbl8\build\appAllBulletDemos\"
+			ConfigurationType="1"
+			CharacterSet="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl8\build\appAllBulletDemos\"
+				ObjectFile="..\..\out\debug_dbl8\build\appAllBulletDemos\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+                                OutputFile="..\..\DebugDblAllBulletDemos.exe"
+                                SubSystem="1"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl8\build\appAllBulletDemos\AllBulletDemos.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl8\build\appAllBulletDemos\appAllBulletDemos.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BasicDemo\BasicDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\BspDemo\BspLoader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\..\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\TestEntries.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Render.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\AllBulletDemos\Test.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath="..\..\msvc\appAllBulletDemos.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/8/appBasicDemo.vcproj b/msvc/8/appBasicDemo.vcproj
index 99aff97f2..8779e6f5a 100644
--- a/msvc/8/appBasicDemo.vcproj
+++ b/msvc/8/appBasicDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\BasicDemo\BasicDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BasicDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/8/appBspDemo.vcproj b/msvc/8/appBspDemo.vcproj
index 954019e6c..441c83518 100644
--- a/msvc/8/appBspDemo.vcproj
+++ b/msvc/8/appBspDemo.vcproj
@@ -310,6 +310,9 @@
 			<File
 				RelativePath="..\..\Demos\BspDemo\BspLoader.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\BspDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/8/appCcdPhysicsDemo.vcproj b/msvc/8/appCcdPhysicsDemo.vcproj
index b66af5c73..f920edacd 100644
--- a/msvc/8/appCcdPhysicsDemo.vcproj
+++ b/msvc/8/appCcdPhysicsDemo.vcproj
@@ -304,6 +304,9 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CcdPhysicsDemo\main.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj
index 4188e09ac..f03efef4d 100644
--- a/msvc/8/libbulletmath.vcproj
+++ b/msvc/8/libbulletmath.vcproj
@@ -358,9 +358,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btStackAlloc.h">
 			</File>
diff --git a/msvc/8/libglui.vcproj b/msvc/8/libglui.vcproj
new file mode 100644
index 000000000..974fb8c82
--- /dev/null
+++ b/msvc/8/libglui.vcproj
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libglui"
+	ProjectGUID="{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\out\release8\build\libglui\"
+			IntermediateDirectory="..\..\out\release8\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				StringPooling="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeLibrary="0"
+				DebugInformationFormat="3"
+				BufferSecurityCheck="FALSE"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release8\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release8\build\libglui\"
+				ObjectFile="..\..\out\release8\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release8\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release8\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\release8\libs\libglui.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release8\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDoublePrecision|Win32"
+			OutputDirectory="..\..\out\release_dbl8\build\libglui\"
+			IntermediateDirectory="..\..\out\release_dbl8\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\release_dbl8\build\libglui\"
+				ObjectFile="..\..\out\release_dbl8\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\release_dbl8\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\release_dbl8\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\release_dbl8\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\out\debug8\build\libglui\"
+			IntermediateDirectory="..\..\out\debug8\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="TRUE"
+				DebugInformationFormat="4"
+				RuntimeTypeInfo="FALSE"
+				RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug8\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug8\build\libglui\"
+				ObjectFile="..\..\out\debug8\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug8\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames="LIBC,LIBCD"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug8\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\out\debug8\libs\libglui_d.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug8\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="DebugDoublePrecision|Win32"
+			OutputDirectory="..\..\out\debug_dbl8\build\libglui\"
+			IntermediateDirectory="..\..\out\debug_dbl8\build\libglui\"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+                                Optimization="0"
+                                MinimalRebuild="TRUE"
+                                DebugInformationFormat="4"
+                                RuntimeTypeInfo="FALSE"
+                                RuntimeLibrary="1"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;WIN32"
+				OptimizeForProcessor="1"
+				ExceptionHandling="0"
+				AdditionalOptions=" "
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libglui\libglui.pch"
+				AssemblerListingLocation="..\..\out\debug_dbl8\build\libglui\"
+				ObjectFile="..\..\out\debug_dbl8\build\libglui\"
+				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\libglui\glui.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				TreatWChar_tAsBuiltInType="false"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" "
+				AdditionalDependencies="glut32.lib"
+				IgnoreImportLibrary="TRUE"
+				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
+				AdditionalLibraryDirectories="..\..\Glut"
+				ProgramDatabaseFile="..\..\out\debug_dbl8\build\libglui\glui.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCLibrarianTool"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="..\..\out\debug_dbl8\build\libglui\libglui.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+		CommandLine="xcopy /r /y $(TARGETPATH) $(PROJECTDIR)..\..\lib\"
+				/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_add_controls.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmap_img_data.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_bitmaps.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_button.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_checkbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_column.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_commandline.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_control.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_edittext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_filebrowser.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_list.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_listbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_mouse_iaction.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_node.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_panel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_radio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rollout.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_rotation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_scrollbar.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_separator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_spinner.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_statictext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_string.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_textbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_translation.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_tree.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_treepanel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_window.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath="..\..\Extras\glui\algebra3.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\arcball.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\glui_internal_control.h">
+			</File>
+			<File
+				RelativePath="..\..\Extras\glui\quaternion.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln
index f156abf39..0f90663a8 100644
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appAllBulletDemos", "appAllBulletDemos.vcproj", "{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDemo.vcproj", "{3578834A-4B06-DE6F-78AC-FE11F7226D35}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}"
@@ -32,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}"
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
@@ -74,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -86,6 +86,11 @@ Global
 		ConfigName.3 = DebugDoublePrecision
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,23 +188,23 @@ Global
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{6210A080-01C0-6D67-F1DB-669393175402}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{6210A080-01C0-6D67-F1DB-669393175402}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{6210A080-01C0-6D67-F1DB-669393175402}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -211,31 +216,31 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {7284F809-AF30-6315-88C6-86F1C0798760}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {69C821C7-1E18-D894-068D-C55E063F4859}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {E2707D44-8B82-55F1-6C5A-D03B19159248}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
@@ -247,16 +252,24 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.Build.0 = Release|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.ActiveCfg = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Debug.Build.0 = Debug|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.Build.0 = Release|Win32
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -385,14 +398,6 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -505,14 +510,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
@@ -553,6 +550,14 @@ Global
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Debug.Build.0 = Debug|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.ActiveCfg = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Release.Build.0 = Release|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.ActiveCfg = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.Debug.Build.0 = Debug|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
+		{81819498-F4A8-E0CA-8ED5-724E27AB34E7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
 		{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
diff --git a/msvc/8/wksbullet_corelib.sln b/msvc/8/wksbullet_corelib.sln
index c0e87643f..ce5d5ba0f 100644
--- a/msvc/8/wksbullet_corelib.sln
+++ b/msvc/8/wksbullet_corelib.sln
@@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}"
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Release
@@ -42,14 +40,6 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/appAllBulletDemos.rc b/msvc/appAllBulletDemos.rc
new file mode 100644
index 000000000..ea42da24a
--- /dev/null
+++ b/msvc/appAllBulletDemos.rc
@@ -0,0 +1,30 @@
+// This file is generated automatically.
+
+1 VERSIONINFO
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+  BLOCK "StringFileInfo"
+  {
+    BLOCK "040904E4"
+    {
+      VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
+      VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
+      VALUE "FileDescription", "AllBulletDemos"
+#ifdef CS_DEBUG
+      VALUE "Comments", "Debug build"
+#else
+      VALUE "Comments", "Release build"
+#endif
+      VALUE "WWW", "http://www.bulletphysics.com"
+    }
+  }
+}
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appBasicDemo.rc b/msvc/appBasicDemo.rc
index 22f75bb56..b2554ed50 100644
--- a/msvc/appBasicDemo.rc
+++ b/msvc/appBasicDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "BasicDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appBspDemo.rc b/msvc/appBspDemo.rc
index 10d281026..426f4a959 100644
--- a/msvc/appBspDemo.rc
+++ b/msvc/appBspDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "BspDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appBulletDino.rc b/msvc/appBulletDino.rc
index 81499a330..cf58f5f85 100644
--- a/msvc/appBulletDino.rc
+++ b/msvc/appBulletDino.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "BulletDino"
 #ifdef CS_DEBUG
diff --git a/msvc/appCcdPhysicsDemo.rc b/msvc/appCcdPhysicsDemo.rc
index de0904b8f..76aff11ab 100644
--- a/msvc/appCcdPhysicsDemo.rc
+++ b/msvc/appCcdPhysicsDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "CcdPhysicsDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appColladaDemo.rc b/msvc/appColladaDemo.rc
index 0d5f8958e..1a661c173 100644
--- a/msvc/appColladaDemo.rc
+++ b/msvc/appColladaDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "ColladaDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appCollisionDemo.rc b/msvc/appCollisionDemo.rc
index 526242e93..bcb9d6914 100644
--- a/msvc/appCollisionDemo.rc
+++ b/msvc/appCollisionDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "CollisionDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appCollisionInterfaceDemo.rc b/msvc/appCollisionInterfaceDemo.rc
index ff612cc7a..b0dfe3334 100644
--- a/msvc/appCollisionInterfaceDemo.rc
+++ b/msvc/appCollisionInterfaceDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "CollisionInterfaceDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appConcaveDemo.rc b/msvc/appConcaveDemo.rc
index 85d0a9b18..ac4bfc8f1 100644
--- a/msvc/appConcaveDemo.rc
+++ b/msvc/appConcaveDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "ConcaveDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appConstraintDemo.rc b/msvc/appConstraintDemo.rc
index cf6689687..c163e6717 100644
--- a/msvc/appConstraintDemo.rc
+++ b/msvc/appConstraintDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "ConstraintDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appContinuousConvexCollision.rc b/msvc/appContinuousConvexCollision.rc
index 1d36c5ed7..3c0a348e8 100644
--- a/msvc/appContinuousConvexCollision.rc
+++ b/msvc/appContinuousConvexCollision.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "ContinuousConvexCollision"
 #ifdef CS_DEBUG
diff --git a/msvc/appConvexDecompositionDemo.rc b/msvc/appConvexDecompositionDemo.rc
index 1f5ffaeb1..aad7de08f 100644
--- a/msvc/appConvexDecompositionDemo.rc
+++ b/msvc/appConvexDecompositionDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "ConvexDecompositionDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appDoublePrecisionDemo.rc b/msvc/appDoublePrecisionDemo.rc
index 7ef286589..aaa1e6312 100644
--- a/msvc/appDoublePrecisionDemo.rc
+++ b/msvc/appDoublePrecisionDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "DoublePrecisionDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appEPAPenDepthDemo.rc b/msvc/appEPAPenDepthDemo.rc
index fe717e3e3..3074cf8ad 100644
--- a/msvc/appEPAPenDepthDemo.rc
+++ b/msvc/appEPAPenDepthDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "EPAPenDepthDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appGenericJointDemo.rc b/msvc/appGenericJointDemo.rc
index 971000f59..05c04ea0e 100644
--- a/msvc/appGenericJointDemo.rc
+++ b/msvc/appGenericJointDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "GenericJointDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appGimpactTestDemo.rc b/msvc/appGimpactTestDemo.rc
index 447d420bf..18289be24 100644
--- a/msvc/appGimpactTestDemo.rc
+++ b/msvc/appGimpactTestDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "GimpactTestDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appGjkConvexCastDemo.rc b/msvc/appGjkConvexCastDemo.rc
index 7d13c017c..0ff86d86f 100644
--- a/msvc/appGjkConvexCastDemo.rc
+++ b/msvc/appGjkConvexCastDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "GjkConvexCastDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appMovingConcaveDemo.rc b/msvc/appMovingConcaveDemo.rc
index 97a82855d..9f4d66255 100644
--- a/msvc/appMovingConcaveDemo.rc
+++ b/msvc/appMovingConcaveDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "MovingConcaveDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appRagdollDemo.rc b/msvc/appRagdollDemo.rc
index 759d37a11..616a25b9e 100644
--- a/msvc/appRagdollDemo.rc
+++ b/msvc/appRagdollDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "RagdollDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appRaytracer.rc b/msvc/appRaytracer.rc
index e0207be06..7d41472c6 100644
--- a/msvc/appRaytracer.rc
+++ b/msvc/appRaytracer.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "Raytracer"
 #ifdef CS_DEBUG
diff --git a/msvc/appSimplexDemo.rc b/msvc/appSimplexDemo.rc
index 6debdc097..549397fa1 100644
--- a/msvc/appSimplexDemo.rc
+++ b/msvc/appSimplexDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "SimplexDemo"
 #ifdef CS_DEBUG
diff --git a/msvc/appUserCollisionAlgorithm.rc b/msvc/appUserCollisionAlgorithm.rc
index 4e472f090..a3fc1f2cf 100644
--- a/msvc/appUserCollisionAlgorithm.rc
+++ b/msvc/appUserCollisionAlgorithm.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "UserCollisionAlgorithm"
 #ifdef CS_DEBUG
diff --git a/msvc/appVehicleDemo.rc b/msvc/appVehicleDemo.rc
index 579e307d9..44f6502b1 100644
--- a/msvc/appVehicleDemo.rc
+++ b/msvc/appVehicleDemo.rc
@@ -1,8 +1,8 @@
 // This file is generated automatically.
 
 1 VERSIONINFO
-FILEVERSION 2, 63, 0, 0
-PRODUCTVERSION 2, 63, 0, 0
+FILEVERSION 2, 64, 0, 0
+PRODUCTVERSION 2, 64, 0, 0
 #ifdef CS_DEBUG
 FILEFLAGS 0x1
 #else
@@ -14,8 +14,8 @@ FILEFLAGS 0x0
     BLOCK "040904E4"
     {
       VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
-      VALUE "ProductVersion", "2.63"
-      VALUE "FileVersion", "2.63"
+      VALUE "ProductVersion", "2.64"
+      VALUE "FileVersion", "2.64"
       VALUE "LegalCopyright", "Copyright (c) 2005-2007  Erwin Coumans"
       VALUE "FileDescription", "VehicleDemo"
 #ifdef CS_DEBUG