diff --git a/Extras/BulletColladaConverter/ColladaConverter.cpp b/Extras/BulletColladaConverter/ColladaConverter.cpp
index 74927ff7c..3eac0dbd3 100644
--- a/Extras/BulletColladaConverter/ColladaConverter.cpp
+++ b/Extras/BulletColladaConverter/ColladaConverter.cpp
@@ -181,13 +181,15 @@ ColladaConverter::~ColladaConverter ()
 	m_collada = NULL;
 	m_dom = NULL;
 
-	for(int i=0;i<m_rbUserInfoHashMap.size();i++)
+	int i;
+
+	for(i=0;i<m_rbUserInfoHashMap.size();i++)
 	{
 		btRigidBodyColladaInfo* rbci = *(m_rbUserInfoHashMap.getAtIndex(i));
 		delete rbci;
 	}
 
-	for(int i=0;i<m_constraintUserInfoHashMap.size();i++)
+	for(i=0;i<m_constraintUserInfoHashMap.size();i++)
 	{
 		btRigidConstraintColladaInfo* rcci = *(m_constraintUserInfoHashMap.getAtIndex(i));
 		delete rcci;
@@ -243,13 +245,14 @@ bool	ColladaConverter::load(const char* orgfilename)
 // resets the collada converter state
 void ColladaConverter::reset ()
 {
-	for(int i=0;i<m_rbUserInfoHashMap.size();i++)
+	int i;
+	for(i=0;i<m_rbUserInfoHashMap.size();i++)
 	{
 		btRigidBodyColladaInfo* rbci = *(m_rbUserInfoHashMap.getAtIndex(i));
 		delete rbci;
 	}
 
-	for(int i=0;i<m_constraintUserInfoHashMap.size();i++)
+	for(i=0;i<m_constraintUserInfoHashMap.size();i++)
 	{
 		btRigidConstraintColladaInfo* rcci = *(m_constraintUserInfoHashMap.getAtIndex(i));
 		delete rcci;
@@ -2436,14 +2439,16 @@ bool ColladaConverter::save(const char* filename)
 		return false;
 	}
 
+	int i;
+
 	/* Dump the scene */
-	for (int i = 0; i < getNumRigidBodies (); i++)
+	for (i = 0; i < getNumRigidBodies (); i++)
 	{
 		syncOrAddRigidBody (getRigidBody(i));
 	}
 
 	/* Dump the constraints */
-	for (int i = 0; i < getNumConstraints (); i++)
+	for (i = 0; i < getNumConstraints (); i++)
 	{
 		syncOrAddConstraint (getConstraint(i));
 	}
@@ -2583,7 +2588,8 @@ char* ColladaConverter::getLastFileName()
 char* ColladaConverter::fixFileName(const char* lpCmdLine)
 {
 
-	for (int i=0;i<513;i++)
+	int i;
+	for (i=0;i<513;i++)
 	{
 		m_cleaned_filename[i]=0;
 	}
@@ -2605,7 +2611,7 @@ char* ColladaConverter::fixFileName(const char* lpCmdLine)
 		// Second character is a :, assume we have a path with a drive letter and add a slash at the beginning
 		*(out++) = '/';
 	}
-	int i;
+	
 	for(i =0; i<512; i++)
 	{
 		// If we hit a null or a quote, stop copying.  This will get just the first filename.
diff --git a/Extras/COLLADA_DOM/include/dae/daeWin32Platform.h b/Extras/COLLADA_DOM/include/dae/daeWin32Platform.h
index c54b6b85b..dde4d081c 100644
--- a/Extras/COLLADA_DOM/include/dae/daeWin32Platform.h
+++ b/Extras/COLLADA_DOM/include/dae/daeWin32Platform.h
@@ -27,6 +27,12 @@
 
 #if _MSC_VER <= 1200
 typedef int intptr_t;
+#undef PLATFORM_INT8
+#define PLATFORM_INT8 char
+#undef PLATFORM_UINT8
+#define PLATFORM_UINT8 unsigned char
+
+
 #endif
 
 
diff --git a/Extras/COLLADA_DOM/src/dae/daeAtomicType.cpp b/Extras/COLLADA_DOM/src/dae/daeAtomicType.cpp
index 52b716d3f..f2f4c5c51 100644
--- a/Extras/COLLADA_DOM/src/dae/daeAtomicType.cpp
+++ b/Extras/COLLADA_DOM/src/dae/daeAtomicType.cpp
@@ -451,6 +451,8 @@ daeBool
 	{
 		strcpy( dst, "NaN" );
 	}
+#if !(defined (_MSC_VER) && _MSC_VER < 1300)
+	//this breaks visual studio 2006, so ignore NaN/INF rather then break the build
 	else if ( *(daeULong*)src == 0x7ff0000000000000LL ) //+INF
 	{
 		strcpy( dst, "INF" );
@@ -459,6 +461,7 @@ daeBool
 	{
 		strcpy( dst, "-INF" );
 	}
+#endif
 	else
 	{
 		sprintf(dst,_printFormat,*((daeDouble*)src));
@@ -469,6 +472,8 @@ daeBool
 daeBool
 daeDoubleType::stringToMemory(daeChar *src, daeChar* dstMemory)
 {
+#if !(defined (_MSC_VER) && _MSC_VER < 1300)
+	//this breaks visual studio 2006, so ignore NaN/INF rather then break the build
 	if ( strcmp(src, "NaN") == 0 ) {
 		daeErrorHandler::get()->handleWarning( "NaN encountered while setting an attribute or value\n" );
 		*(daeLong*)(dstMemory) = 0x7ff0000000000002LL;
@@ -482,6 +487,7 @@ daeDoubleType::stringToMemory(daeChar *src, daeChar* dstMemory)
 		*(daeLong*)(dstMemory) = 0xfff0000000000000LL;
 	}
 	else
+#endif
 	{
 		sscanf(src, _scanFormat, dstMemory);
 	}
diff --git a/Extras/COLLADA_DOM/src/dae/daeElement.cpp b/Extras/COLLADA_DOM/src/dae/daeElement.cpp
index 3a3f5b36a..da9307d8f 100644
--- a/Extras/COLLADA_DOM/src/dae/daeElement.cpp
+++ b/Extras/COLLADA_DOM/src/dae/daeElement.cpp
@@ -462,7 +462,7 @@ daeElement::~daeElement()
 		_intObject->release();
 
 	if (_elementName) {
-		delete[] _elementName;
+		delete[] (void*) _elementName;
 		_elementName = NULL;
 	}
 }
@@ -478,7 +478,7 @@ daeString daeElement::getElementName() const
 }
 void daeElement::setElementName( daeString nm ) {
 	if ( nm == NULL ) {
-		if ( _elementName ) delete[] _elementName;
+		if ( _elementName ) delete[] (void*)_elementName;
 		_elementName = NULL;
 		return;
 	}
diff --git a/Extras/COLLADA_DOM/src/dae/daeSIDResolver.cpp b/Extras/COLLADA_DOM/src/dae/daeSIDResolver.cpp
index 399e8fd46..65c753d14 100644
--- a/Extras/COLLADA_DOM/src/dae/daeSIDResolver.cpp
+++ b/Extras/COLLADA_DOM/src/dae/daeSIDResolver.cpp
@@ -46,11 +46,11 @@ daeSIDResolver::daeSIDResolver( daeElement *container, daeString target, daeStri
 daeSIDResolver::~daeSIDResolver()
 {
 	if ( target != NULL ) {
-		delete[] target;
+		delete[] (void*)target;
 		target = NULL;
 	}
 	if ( profile != NULL ) {
-		delete[] profile;
+		delete[] (void*)profile;
 		profile = NULL;
 	}
 }
@@ -58,7 +58,7 @@ daeSIDResolver::~daeSIDResolver()
 void daeSIDResolver::setTarget( daeString t )
 {
 	if ( target != NULL ) {
-		delete[] target;
+		delete[] (void*)target;
 	}
 	if ( t != NULL ) {
 		target = new char[ strlen( t ) +1 ];
@@ -78,7 +78,7 @@ void daeSIDResolver::setTarget( daeString t )
 void daeSIDResolver::setProfile( daeString p )
 {
 	if ( profile != NULL ) {
-		delete[] target;
+		delete[] (void*)target;
 	}
 	if ( p != NULL ) {
 		profile = new char[ strlen( p ) +1 ];
@@ -335,8 +335,10 @@ daeElement *daeSIDResolver::findSID( daeElement *el, daeString sid ) {
 	
 	daeElementRefArray children;
 	el->getChildren( children );
-	size_t cnt = children.getCount();
-	for ( size_t x = 0; x < cnt; x++ ) {
+	size_t cnt = children.getCount();
+	size_t x;
+
+	for ( x = 0; x < cnt; x++ ) {
 		//examine the children
 		//char s[56]; 
 		//daeAtomicType::get( "token" )->memoryToString( children[x]->getAttributeValue( "sid" ), s, 56 );
@@ -346,7 +348,7 @@ daeElement *daeSIDResolver::findSID( daeElement *el, daeString sid ) {
 			return children[x];
 		}
 	}
-	for ( size_t x = 0; x < cnt; x++ ) {
+	for ( x = 0; x < cnt; x++ ) {
 		//if not found look for it in each child
 		if ( profile != NULL && strcmp( children[x]->getTypeName(), "technique_COMMON" ) == 0 ) {
 			//not looking for common profile
diff --git a/Extras/COLLADA_DOM/src/modules/STLDatabase/daeSTLDatabase.cpp b/Extras/COLLADA_DOM/src/modules/STLDatabase/daeSTLDatabase.cpp
index 6d1d6d501..b19c71591 100644
--- a/Extras/COLLADA_DOM/src/modules/STLDatabase/daeSTLDatabase.cpp
+++ b/Extras/COLLADA_DOM/src/modules/STLDatabase/daeSTLDatabase.cpp
@@ -602,12 +602,13 @@ void daeSTLDatabase::validate()
 		if (documents[i]->getModified() ) {
 			daeDocument *tmp = documents[i];
 			const daeElementRefArray &rea = tmp->getRemovedArray();
-			for ( unsigned int x = 0; x < rea.getCount(); x++ ) {
+			unsigned int x;
+			for ( x = 0; x < rea.getCount(); x++ ) {
 				removeElement( tmp, rea[x] );
 			}
 
 			const daeElementRefArray &iea = tmp->getInsertedArray();
-			for ( unsigned int x = 0; x < iea.getCount(); x++ ) {
+			for ( x = 0; x < iea.getCount(); x++ ) {
 				insertElement( tmp, iea[x] );
 			}
 			
diff --git a/mk/msvcgen/projectx6.tlib b/mk/msvcgen/projectx6.tlib
index 32829df66..c8d4f642e 100644
--- a/mk/msvcgen/projectx6.tlib
+++ b/mk/msvcgen/projectx6.tlib
@@ -63,8 +63,8 @@ GET glue(my.doc.librarydelay,' ','/DELAYLOAD:','.dll') %]
 [% MACRO usedebuglibs_release GET '0' %]
 [% MACRO usedebuglibs_debug   GET '1' %]
 
-[% MACRO addcpp_release GET '/Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy' %]
-[% MACRO addcpp_debug   GET '/GR /MDd /ZI /Od' %]
+[% MACRO addcpp_release GET '/Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy' %]
+[% MACRO addcpp_debug   GET '/GR /MDd /Zm1000 /ZI /Od' %]
 [% MACRO addcpp_library GET '/D "_LIB"' %]
 
 [% MACRO ignoreexportlib_common(bool) BLOCK -%]
diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp
index 06ccc2ca3..e9fc1bc0f 100644
--- a/msvc/6/appAllBulletDemos.dsp
+++ b/msvc/6/appAllBulletDemos.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appBasicDemo.dsp b/msvc/6/appBasicDemo.dsp
index 1b8294e4d..906555805 100644
--- a/msvc/6/appBasicDemo.dsp
+++ b/msvc/6/appBasicDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appBenchmarks.dsp b/msvc/6/appBenchmarks.dsp
index baa046978..5aa285121 100644
--- a/msvc/6/appBenchmarks.dsp
+++ b/msvc/6/appBenchmarks.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appBspDemo.dsp b/msvc/6/appBspDemo.dsp
index 067f987fd..636db3feb 100644
--- a/msvc/6/appBspDemo.dsp
+++ b/msvc/6/appBspDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appBulletDino.dsp b/msvc/6/appBulletDino.dsp
index 5e0970faa..4c07d650d 100644
--- a/msvc/6/appBulletDino.dsp
+++ b/msvc/6/appBulletDino.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appCcdPhysicsDemo.dsp b/msvc/6/appCcdPhysicsDemo.dsp
index 014224e4a..3afd84dea 100644
--- a/msvc/6/appCcdPhysicsDemo.dsp
+++ b/msvc/6/appCcdPhysicsDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appCharacterDemo.dsp b/msvc/6/appCharacterDemo.dsp
index 6bf5c7606..5585df4af 100644
--- a/msvc/6/appCharacterDemo.dsp
+++ b/msvc/6/appCharacterDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appColladaDemo.dsp b/msvc/6/appColladaDemo.dsp
index 4b1b6a0e3..41011e177 100644
--- a/msvc/6/appColladaDemo.dsp
+++ b/msvc/6/appColladaDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\FCollada"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\FCollada"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\FCollada"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\FCollada"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appCollisionDemo.dsp b/msvc/6/appCollisionDemo.dsp
index 48d797c5c..e80736119 100644
--- a/msvc/6/appCollisionDemo.dsp
+++ b/msvc/6/appCollisionDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appCollisionInterfaceDemo.dsp b/msvc/6/appCollisionInterfaceDemo.dsp
index 2340372c2..884c4c27b 100644
--- a/msvc/6/appCollisionInterfaceDemo.dsp
+++ b/msvc/6/appCollisionInterfaceDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appConcaveDemo.dsp b/msvc/6/appConcaveDemo.dsp
index c21ad1a79..d4193cb83 100644
--- a/msvc/6/appConcaveDemo.dsp
+++ b/msvc/6/appConcaveDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appConstraintDemo.dsp b/msvc/6/appConstraintDemo.dsp
index e730928d5..5a6d8fc81 100644
--- a/msvc/6/appConstraintDemo.dsp
+++ b/msvc/6/appConstraintDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appContinuousConvexCollision.dsp b/msvc/6/appContinuousConvexCollision.dsp
index 1ed7ee64b..ba82b55a8 100644
--- a/msvc/6/appContinuousConvexCollision.dsp
+++ b/msvc/6/appContinuousConvexCollision.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appConvexDecompositionDemo.dsp b/msvc/6/appConvexDecompositionDemo.dsp
index 4da6fbca7..d2405e55c 100644
--- a/msvc/6/appConvexDecompositionDemo.dsp
+++ b/msvc/6/appConvexDecompositionDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appDoublePrecisionDemo.dsp b/msvc/6/appDoublePrecisionDemo.dsp
index 9bffc7d62..c60fefd2d 100644
--- a/msvc/6/appDoublePrecisionDemo.dsp
+++ b/msvc/6/appDoublePrecisionDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appEPAPenDepthDemo.dsp b/msvc/6/appEPAPenDepthDemo.dsp
index 83e18a3bd..eabb851dc 100644
--- a/msvc/6/appEPAPenDepthDemo.dsp
+++ b/msvc/6/appEPAPenDepthDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appForkLiftDemo.dsp b/msvc/6/appForkLiftDemo.dsp
index b414e147f..f7c7840f2 100644
--- a/msvc/6/appForkLiftDemo.dsp
+++ b/msvc/6/appForkLiftDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appGenericJointDemo.dsp b/msvc/6/appGenericJointDemo.dsp
index eba491fe9..be1f1eba6 100644
--- a/msvc/6/appGenericJointDemo.dsp
+++ b/msvc/6/appGenericJointDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appGimpactTestDemo.dsp b/msvc/6/appGimpactTestDemo.dsp
index 422bd364c..76315f985 100644
--- a/msvc/6/appGimpactTestDemo.dsp
+++ b/msvc/6/appGimpactTestDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appGjkConvexCastDemo.dsp b/msvc/6/appGjkConvexCastDemo.dsp
index 9f9056359..03a933330 100644
--- a/msvc/6/appGjkConvexCastDemo.dsp
+++ b/msvc/6/appGjkConvexCastDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appHelloWorld.dsp b/msvc/6/appHelloWorld.dsp
index f8840b6f4..525fa6009 100644
--- a/msvc/6/appHelloWorld.dsp
+++ b/msvc/6/appHelloWorld.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appMovingConcaveDemo.dsp b/msvc/6/appMovingConcaveDemo.dsp
index 81e32f045..081034979 100644
--- a/msvc/6/appMovingConcaveDemo.dsp
+++ b/msvc/6/appMovingConcaveDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appMultiMaterialDemo.dsp b/msvc/6/appMultiMaterialDemo.dsp
index 757b11ff8..8bb1c1ba4 100644
--- a/msvc/6/appMultiMaterialDemo.dsp
+++ b/msvc/6/appMultiMaterialDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appMultiThreadedDemo.dsp b/msvc/6/appMultiThreadedDemo.dsp
index c97539612..2de065994 100644
--- a/msvc/6/appMultiThreadedDemo.dsp
+++ b/msvc/6/appMultiThreadedDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appRagdollDemo.dsp b/msvc/6/appRagdollDemo.dsp
index 53892cbdd..8b6b6e0a8 100644
--- a/msvc/6/appRagdollDemo.dsp
+++ b/msvc/6/appRagdollDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appRaytracer.dsp b/msvc/6/appRaytracer.dsp
index 9207c1882..986b3b369 100644
--- a/msvc/6/appRaytracer.dsp
+++ b/msvc/6/appRaytracer.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appSimplexDemo.dsp b/msvc/6/appSimplexDemo.dsp
index 2a242632e..7db16528e 100644
--- a/msvc/6/appSimplexDemo.dsp
+++ b/msvc/6/appSimplexDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appSliderConstraintDemo.dsp b/msvc/6/appSliderConstraintDemo.dsp
index 3c5cbbc95..9d885f8be 100644
--- a/msvc/6/appSliderConstraintDemo.dsp
+++ b/msvc/6/appSliderConstraintDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appSoftBodyDemo.dsp b/msvc/6/appSoftBodyDemo.dsp
index 3efb1b695..8d53092af 100644
--- a/msvc/6/appSoftBodyDemo.dsp
+++ b/msvc/6/appSoftBodyDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appTerrainDemo.dsp b/msvc/6/appTerrainDemo.dsp
index de12c0260..5e7302862 100644
--- a/msvc/6/appTerrainDemo.dsp
+++ b/msvc/6/appTerrainDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appUserCollisionAlgorithm.dsp b/msvc/6/appUserCollisionAlgorithm.dsp
index c5a86bea1..bde2dbd39 100644
--- a/msvc/6/appUserCollisionAlgorithm.dsp
+++ b/msvc/6/appUserCollisionAlgorithm.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appVehicleDemo.dsp b/msvc/6/appVehicleDemo.dsp
index 808610b2c..9d5b72241 100644
--- a/msvc/6/appVehicleDemo.dsp
+++ b/msvc/6/appVehicleDemo.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/appiffCheck.dsp b/msvc/6/appiffCheck.dsp
index 9ccfe3aa1..018d67b1f 100644
--- a/msvc/6/appiffCheck.dsp
+++ b/msvc/6/appiffCheck.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -132,7 +132,7 @@ LINK32=link.exe
 # 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 "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grpall_bullet.dsp b/msvc/6/grpall_bullet.dsp
index 58b6eaf28..3818d5508 100644
--- a/msvc/6/grpall_bullet.dsp
+++ b/msvc/6/grpall_bullet.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grpall_bullet_corelib.dsp b/msvc/6/grpall_bullet_corelib.dsp
index 6e96497cf..76f3ccc89 100644
--- a/msvc/6/grpall_bullet_corelib.dsp
+++ b/msvc/6/grpall_bullet_corelib.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grpapps_bullet.dsp b/msvc/6/grpapps_bullet.dsp
index e42b00e16..a78a55ee9 100644
--- a/msvc/6/grpapps_bullet.dsp
+++ b/msvc/6/grpapps_bullet.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grpapps_bullet_corelib.dsp b/msvc/6/grpapps_bullet_corelib.dsp
index 59a637241..b6f22e578 100644
--- a/msvc/6/grpapps_bullet_corelib.dsp
+++ b/msvc/6/grpapps_bullet_corelib.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grplibs_bullet.dsp b/msvc/6/grplibs_bullet.dsp
index d1c91a7b4..e7ac081f3 100644
--- a/msvc/6/grplibs_bullet.dsp
+++ b/msvc/6/grplibs_bullet.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/grplibs_bullet_corelib.dsp b/msvc/6/grplibs_bullet_corelib.dsp
index 1d851682f..f31cbfad7 100644
--- a/msvc/6/grplibs_bullet_corelib.dsp
+++ b/msvc/6/grplibs_bullet_corelib.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libBulletColladaConverter.dsp b/msvc/6/libBulletColladaConverter.dsp
index db5ff5fa9..3d4cca35e 100644
--- a/msvc/6/libBulletColladaConverter.dsp
+++ b/msvc/6/libBulletColladaConverter.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\ConvexHull"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\ConvexHull"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libGIMPACTUtils.dsp b/msvc/6/libGIMPACTUtils.dsp
index adeefbf35..7b8f1f38b 100644
--- a/msvc/6/libGIMPACTUtils.dsp
+++ b/msvc/6/libGIMPACTUtils.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp
index d075abaee..4993f826c 100644
--- a/msvc/6/libbulletcollision.dsp
+++ b/msvc/6/libbulletcollision.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp
index a06868220..1e72ca102 100644
--- a/msvc/6/libbulletdynamics.dsp
+++ b/msvc/6/libbulletdynamics.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp
index 6c77eb351..a20c33d6c 100644
--- a/msvc/6/libbulletmath.dsp
+++ b/msvc/6/libbulletmath.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletmultithreaded.dsp b/msvc/6/libbulletmultithreaded.dsp
index d195864b5..c6a58ec6b 100644
--- a/msvc/6/libbulletmultithreaded.dsp
+++ b/msvc/6/libbulletmultithreaded.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletopenglsupport.dsp b/msvc/6/libbulletopenglsupport.dsp
index b5039f5f1..b08f60900 100644
--- a/msvc/6/libbulletopenglsupport.dsp
+++ b/msvc/6/libbulletopenglsupport.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /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" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /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" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libbulletsoftbody.dsp b/msvc/6/libbulletsoftbody.dsp
index dfb66c672..f3403cdef 100644
--- a/msvc/6/libbulletsoftbody.dsp
+++ b/msvc/6/libbulletsoftbody.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libcolladadom.dsp b/msvc/6/libcolladadom.dsp
index 01c74c8c8..4e8d8a499 100644
--- a/msvc/6/libcolladadom.dsp
+++ b/msvc/6/libcolladadom.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\Demos\OpenGL" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\Demos\OpenGL" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\Demos\OpenGL" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\Demos\OpenGL" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libconvexdecomposition.dsp b/msvc/6/libconvexdecomposition.dsp
index 00d4f26cf..b4f8f7271 100644
--- a/msvc/6/libconvexdecomposition.dsp
+++ b/msvc/6/libconvexdecomposition.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libglui.dsp b/msvc/6/libglui.dsp
index 6ab9aa452..f7b459301 100644
--- a/msvc/6/libglui.dsp
+++ b/msvc/6/libglui.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /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" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /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" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/libiff.dsp b/msvc/6/libiff.dsp
index 7283a3e36..fd2ba39d5 100644
--- a/msvc/6/libiff.dsp
+++ b/msvc/6/libiff.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\iff"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/liblibxml.dsp b/msvc/6/liblibxml.dsp
index 147c5f835..963e2bc8f 100644
--- a/msvc/6/liblibxml.dsp
+++ b/msvc/6/liblibxml.dsp
@@ -47,7 +47,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Zm1000 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /Zm1000 /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index 5ae93d735..60cf801ae 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -57,6 +57,9 @@ 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
 }}}
@@ -81,6 +84,9 @@ 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
 }}}
@@ -105,6 +111,9 @@ 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
 }}}
@@ -129,6 +138,9 @@ 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
 }}}
@@ -153,6 +165,9 @@ 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
 }}}
@@ -177,6 +192,9 @@ 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
 }}}
@@ -234,6 +252,9 @@ 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
 }}}
@@ -258,6 +279,9 @@ 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
 }}}
@@ -282,6 +306,9 @@ 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
 }}}
@@ -306,6 +333,9 @@ 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
 }}}
@@ -330,6 +360,9 @@ 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
 }}}
@@ -381,6 +414,9 @@ 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
 }}}
@@ -429,6 +465,9 @@ 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
 }}}
@@ -453,6 +492,9 @@ 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
 }}}
@@ -507,6 +549,9 @@ 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
 }}}
@@ -591,6 +636,9 @@ 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
 }}}
@@ -642,6 +690,9 @@ 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
 }}}
@@ -666,6 +717,9 @@ 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
 }}}
@@ -690,6 +744,9 @@ 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
 }}}
@@ -714,6 +771,9 @@ 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
 }}}
@@ -765,6 +825,9 @@ 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
 }}}
@@ -789,6 +852,9 @@ 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
 }}}
@@ -813,6 +879,9 @@ 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
 }}}
diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln
index d6807a7ce..0b347398a 100644
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -119,27 +119,33 @@ Global
 		{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}
-		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -150,23 +156,28 @@ Global
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -175,7 +186,8 @@ Global
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,11 +195,13 @@ Global
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -197,7 +211,8 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -209,7 +224,8 @@ Global
 		{7C050627-6267-11A1-E342-374FA0095116}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7C050627-6267-11A1-E342-374FA0095116}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7C050627-6267-11A1-E342-374FA0095116}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7C050627-6267-11A1-E342-374FA0095116}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7C050627-6267-11A1-E342-374FA0095116}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7C050627-6267-11A1-E342-374FA0095116}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -218,19 +234,23 @@ Global
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -239,15 +259,18 @@ Global
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{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}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{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 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln
index ae7e78eea..9cafbd07f 100644
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -119,27 +119,33 @@ Global
 		{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}
-		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -150,23 +156,28 @@ Global
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -175,7 +186,8 @@ Global
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,11 +195,13 @@ Global
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -197,7 +211,8 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -209,7 +224,8 @@ Global
 		{7C050627-6267-11A1-E342-374FA0095116}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7C050627-6267-11A1-E342-374FA0095116}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7C050627-6267-11A1-E342-374FA0095116}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7C050627-6267-11A1-E342-374FA0095116}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7C050627-6267-11A1-E342-374FA0095116}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7C050627-6267-11A1-E342-374FA0095116}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -218,19 +234,23 @@ Global
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -239,15 +259,18 @@ Global
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{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}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{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 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln
index 7a8db1b10..56fb98980 100644
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -119,27 +119,33 @@ Global
 		{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}
-		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
@@ -150,23 +156,28 @@ Global
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -175,7 +186,8 @@ Global
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -183,11 +195,13 @@ Global
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -197,7 +211,8 @@ Global
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -209,7 +224,8 @@ Global
 		{7C050627-6267-11A1-E342-374FA0095116}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7C050627-6267-11A1-E342-374FA0095116}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7C050627-6267-11A1-E342-374FA0095116}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7C050627-6267-11A1-E342-374FA0095116}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7C050627-6267-11A1-E342-374FA0095116}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7C050627-6267-11A1-E342-374FA0095116}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -218,19 +234,23 @@ Global
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -239,15 +259,18 @@ Global
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{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}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
+		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{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 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.cpp b/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
index ed607f4db..f999b588b 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
+++ b/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
@@ -37,11 +37,11 @@ static DBVT_INLINE int			indexof(const btDbvtNode* node)
 static DBVT_INLINE btDbvtVolume	merge(	const btDbvtVolume& a,
 									  const btDbvtVolume& b)
 {
-#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
-	DBVT_ALIGN char locals[sizeof(btDbvtAabbMm)];
+#if (DBVT_MERGE_IMPL==DBVT_IMPL_SSE)
+	ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtAabbMm)]);
 	btDbvtVolume&	res=*(btDbvtVolume*)locals;
 #else
-	btDbvtVolume	res;
+		btDbvtVolume	res;
 #endif
 	Merge(a,b,res);
 	return(res);
@@ -249,7 +249,7 @@ static void						split(	const tNodeArray& leaves,
 static btDbvtVolume				bounds(	const tNodeArray& leaves)
 {
 #if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
-	DBVT_ALIGN char	locals[sizeof(btDbvtVolume)];
+	ATTRIBUTE_ALIGNED16(char	locals[sizeof(btDbvtVolume)]);
 	btDbvtVolume&	volume=*(btDbvtVolume*)locals;
 	volume=leaves[0]->volume;
 #else
diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h
index 2692999c0..5a0f1c2f7 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvt.h
+++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -53,12 +53,6 @@ subject to the following restrictions:
 
 // Inlining
 #define DBVT_INLINE				SIMD_FORCE_INLINE
-// Align
-#ifdef WIN32
-#define DBVT_ALIGN				__declspec(align(16))
-#else
-#define DBVT_ALIGN
-#endif
 
 // Specific methods implementation
 
diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index 761b4c8a2..6b2090044 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -792,7 +792,7 @@ public:
 			return false;
 
 		///don't do CCD when the collision filters are not matching
-		if (!btCollisionWorld::ClosestConvexResultCallback::needsCollision(proxy0))
+		if (!ClosestConvexResultCallback::needsCollision(proxy0))
 			return false;
 
 		///don't do CCD when there are already contact points (touching contact/penetration)
diff --git a/src/BulletSoftBody/btSoftBodyHelpers.cpp b/src/BulletSoftBody/btSoftBodyHelpers.cpp
index eb86d4587..a6b5268dc 100644
--- a/src/BulletSoftBody/btSoftBodyHelpers.cpp
+++ b/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -641,7 +641,9 @@ btSoftBody*		btSoftBodyHelpers::CreatePatchUV(btSoftBodyWorldInfo& worldInfo,
 	btVector3*	x=new btVector3[tot];
 	btScalar*	m=new btScalar[tot];
 
-	for(int iy=0;iy<ry;++iy)
+	int iy;
+
+	for(iy=0;iy<ry;++iy)
 	{
 		const btScalar	ty=iy/(btScalar)(ry-1);
 		const btVector3	py0=lerp(corner00,corner01,ty);
@@ -669,7 +671,7 @@ btSoftBody*		btSoftBodyHelpers::CreatePatchUV(btSoftBodyWorldInfo& worldInfo,
 
 	int z = 0;
 	/* Create links	and faces	*/ 
-	for(int iy=0;iy<ry;++iy)
+	for(iy=0;iy<ry;++iy)
 	{
 		for(int ix=0;ix<rx;++ix)
 		{
diff --git a/src/LinearMath/btQuickprof.cpp b/src/LinearMath/btQuickprof.cpp
index 459d72586..0fb89d6b3 100644
--- a/src/LinearMath/btQuickprof.cpp
+++ b/src/LinearMath/btQuickprof.cpp
@@ -298,6 +298,7 @@ void	CProfileManager::DumpRecursive(CProfileIterator* profileIterator, int spaci
 
 	
 	int numChildren = 0;
+	
 	for (i = 0; !profileIterator->Is_Done(); i++,profileIterator->Next())
 	{
 		numChildren++;
@@ -318,7 +319,8 @@ void	CProfileManager::DumpRecursive(CProfileIterator* profileIterator, int spaci
 	}
 	for (i=0;i<spacing;i++)	printf(".");
 	printf("%s (%.3f %%) :: %.3f ms\n", "Unaccounted:",parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f, parent_time - accumulated_time);
-	for (int i=0;i<numChildren;i++)
+	
+	for (i=0;i<numChildren;i++)
 	{
 		profileIterator->Enter_Child(i);
 		DumpRecursive(profileIterator,spacing+3);