updated autogenerated msvc projectfiles, minor fix in Gimpact/btGImpactShape.h (shapeType) and btWin32ThreadInterface.

Demos/MultiThreadedDemo/MultiThreadedDemo.cpp

@@ -1,478 +1,478 @@
-/*
+/*
-Bullet Continuous Collision Detection and Physics Library
+Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
+
-This software is provided 'as-is', without any express or implied warranty.
+This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
+In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
+Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
+subject to the following restrictions:
-
+
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+3. This notice may not be removed or altered from any source distribution.
-*/
+*/
-
+
-//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver
+//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver
-#define USE_PARALLEL_DISPATCHER 1
+#define USE_PARALLEL_DISPATCHER 1
-
+
-#include "btBulletDynamicsCommon.h"
+#include "btBulletDynamicsCommon.h"
-#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
-
+
-#ifdef USE_PARALLEL_DISPATCHER
+#ifdef USE_PARALLEL_DISPATCHER
-#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
+#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
-#include "BulletMultiThreaded/PlatformDefinitions.h"
+#include "BulletMultiThreaded/PlatformDefinitions.h"
-
+
-#ifdef USE_LIBSPE2
+#ifdef USE_LIBSPE2
-#include "BulletMultiThreaded/SpuLibspe2Support.h"
+#include "BulletMultiThreaded/SpuLibspe2Support.h"
-#elif defined (WIN32)
+#elif defined (WIN32)
-#include "BulletMultiThreaded/Win32ThreadSupport.h"
+#include "BulletMultiThreaded/Win32ThreadSupport.h"
-#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
-
+
-#elif defined (USE_PTHREADS)
+#elif defined (USE_PTHREADS)
-
+
-#include "BulletMultiThreaded/PosixThreadSupport.h"
+#include "BulletMultiThreaded/PosixThreadSupport.h"
-#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
-
+
-#else
+#else
-//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
+//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
-#include "BulletMultiThreaded/SequentialThreadSupport.h"
+#include "BulletMultiThreaded/SequentialThreadSupport.h"
-#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
-#endif //USE_LIBSPE2
+#endif //USE_LIBSPE2
-
+
-#ifdef USE_PARALLEL_SOLVER
+#ifdef USE_PARALLEL_SOLVER
-#include "BulletMultiThreaded/SpuParallelSolver.h"
+#include "BulletMultiThreaded/SpuParallelSolver.h"
-#include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h"
+#include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h"
-#endif //USE_PARALLEL_SOLVER
+#endif //USE_PARALLEL_SOLVER
-
+
-#endif//USE_PARALLEL_DISPATCHER
+#endif//USE_PARALLEL_DISPATCHER
-
+
-
+
-#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btQuickprof.h"
-#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btIDebugDraw.h"
-
+
-
+
-#include "BMF_Api.h"
+#include "BMF_Api.h"
-#include <stdio.h> //printf debugging
+#include <stdio.h> //printf debugging
-
+
-#include "MultiThreadedDemo.h"
+#include "MultiThreadedDemo.h"
-#include "GL_ShapeDrawer.h"
+#include "GL_ShapeDrawer.h"
-
+
-#include "GlutStuff.h"
+#include "GlutStuff.h"
-
+
-
+
-extern float eye[3];
+extern float eye[3];
-extern int glutScreenWidth;
+extern int glutScreenWidth;
-extern int glutScreenHeight;
+extern int glutScreenHeight;
-
+
-const int maxProxies = 32766;
+const int maxProxies = 32766;
-const int maxOverlap = 65535;
+const int maxOverlap = 65535;
-
+
-
+
-
+
-
+
-#ifdef _DEBUG
+#ifdef _DEBUG
-const int gNumObjects = 120;
+const int gNumObjects = 120;
-#else
+#else
-const int gNumObjects = 120;//try this in release mode: 3000. never go above 16384, unless you increate maxNumObjects  value in DemoApplication.cp
+const int gNumObjects = 120;//try this in release mode: 3000. never go above 16384, unless you increate maxNumObjects  value in DemoApplication.cp
-#endif
+#endif
-
+
-
+
-const int maxNumObjects = 32760;
+const int maxNumObjects = 32760;
-
+
-static int	shapeIndex[maxNumObjects];
+static int	shapeIndex[maxNumObjects];
-
+
-
+
-#define CUBE_HALF_EXTENTS 0.5
+#define CUBE_HALF_EXTENTS 0.5
-
+
-#define EXTRA_HEIGHT -10.f
+#define EXTRA_HEIGHT -10.f
-//GL_LineSegmentShape shapeE(btPoint3(-50,0,0),
+//GL_LineSegmentShape shapeE(btPoint3(-50,0,0),
-//						   btPoint3(50,0,0));
+//						   btPoint3(50,0,0));
-
+
-
+
-void MultiThreadedDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos )
+void MultiThreadedDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos )
-{
+{
-	btTransform trans;
+	btTransform trans;
-	trans.setIdentity();
+	trans.setIdentity();
-
+
-	for(int i=0; i<size; i++)
+	for(int i=0; i<size; i++)
-	{
+	{
-		// This constructs a row, from left to right
+		// This constructs a row, from left to right
-		int rowSize = size - i;
+		int rowSize = size - i;
-		for(int j=0; j< rowSize; j++)
+		for(int j=0; j< rowSize; j++)
-		{
+		{
-			btVector4 pos;
+			btVector4 pos;
-			pos.setValue(
+			pos.setValue(
-				-rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize,
+				-rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize,
-				halfCubeSize + i * halfCubeSize * 2.0f,
+				halfCubeSize + i * halfCubeSize * 2.0f,
-				zPos);
+				zPos);
-			
+			
-			trans.setOrigin(pos);
+			trans.setOrigin(pos);
-			btScalar mass = 1.f;
+			btScalar mass = 1.f;
-
+
-			btRigidBody* body = 0;
+			btRigidBody* body = 0;
-			body = localCreateRigidBody(mass,trans,boxShape);
+			body = localCreateRigidBody(mass,trans,boxShape);
-
+
-		}
+		}
-	}
+	}
-}
+}
-
+
-
+
-////////////////////////////////////
+////////////////////////////////////
-
+
-
+
-
+
-
+
-
+
-//experimental jitter damping (1 = no damping, 0 = total damping once motion below threshold)
+//experimental jitter damping (1 = no damping, 0 = total damping once motion below threshold)
-extern btScalar gJitterVelocityDampingFactor;
+extern btScalar gJitterVelocityDampingFactor;
-
+
-
+
-
+
-
+
-extern int gNumManifold;
+extern int gNumManifold;
-extern int gOverlappingPairs;
+extern int gOverlappingPairs;
-extern int gTotalContactPoints;
+extern int gTotalContactPoints;
-
+
-void MultiThreadedDemo::clientMoveAndDisplay()
+void MultiThreadedDemo::clientMoveAndDisplay()
-{
+{
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 
-
+
-
+
-
+
-	float dt = getDeltaTimeMicroseconds() * 0.000001f;
+	float dt = getDeltaTimeMicroseconds() * 0.000001f;
-	
+	
-//	printf("dt = %f: ",dt);
+//	printf("dt = %f: ",dt);
-	
+	
-	if (m_dynamicsWorld)
+	if (m_dynamicsWorld)
-	{
+	{
-
+
-//#define FIXED_STEP 1
+//#define FIXED_STEP 1
-#ifdef FIXED_STEP
+#ifdef FIXED_STEP
-  		m_dynamicsWorld->stepSimulation(1.0f/60.f,0);
+  		m_dynamicsWorld->stepSimulation(1.0f/60.f,0);
-	
+	
-#else
+#else
-		//during idle mode, just run 1 simulation step maximum
+		//during idle mode, just run 1 simulation step maximum
-		int maxSimSubSteps = m_idle ? 1 : 1;
+		int maxSimSubSteps = m_idle ? 1 : 1;
-		if (m_idle)
+		if (m_idle)
-			dt = 1.0/420.f;
+			dt = 1.0/420.f;
-
+
-		int numSimSteps = 0;
+		int numSimSteps = 0;
-		numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps);
+		numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps);
-		
+		
-		//optional but useful: debug drawing
+		//optional but useful: debug drawing
-		m_dynamicsWorld->debugDrawWorld();
+		m_dynamicsWorld->debugDrawWorld();
-
+
-#ifdef VERBOSE_TIMESTEPPING_CONSOLEOUTPUT
+#ifdef VERBOSE_TIMESTEPPING_CONSOLEOUTPUT
-		if (!numSimSteps)
+		if (!numSimSteps)
-			printf("Interpolated transforms\n");
+			printf("Interpolated transforms\n");
-		else
+		else
-		{
+		{
-			if (numSimSteps > maxSimSubSteps)
+			if (numSimSteps > maxSimSubSteps)
-			{
+			{
-				//detect dropping frames
+				//detect dropping frames
-				printf("Dropped (%i) simulation steps out of %i\n",numSimSteps - maxSimSubSteps,numSimSteps);
+				printf("Dropped (%i) simulation steps out of %i\n",numSimSteps - maxSimSubSteps,numSimSteps);
-			} else
+			} else
-			{
+			{
-				printf("Simulated (%i) steps\n",numSimSteps);
+				printf("Simulated (%i) steps\n",numSimSteps);
-			}
+			}
-		}
+		}
-#endif //VERBOSE_TIMESTEPPING_CONSOLEOUTPUT
+#endif //VERBOSE_TIMESTEPPING_CONSOLEOUTPUT
-
+
-#endif
+#endif
-	}
+	}
-	
+	
-#ifdef USE_QUICKPROF 
+#ifdef USE_QUICKPROF 
-        btProfiler::beginBlock("render"); 
+        btProfiler::beginBlock("render"); 
-#endif //USE_QUICKPROF 
+#endif //USE_QUICKPROF 
-	
+	
-	renderme(); 
+	renderme(); 
-
+
-
+
-	//render the graphics objects, with center of mass shift
+	//render the graphics objects, with center of mass shift
-
+
-		updateCamera();
+		updateCamera();
-
+
-
+
-
+
-#ifdef USE_QUICKPROF 
+#ifdef USE_QUICKPROF 
-        btProfiler::endBlock("render"); 
+        btProfiler::endBlock("render"); 
-#endif 
+#endif 
-	glFlush();
+	glFlush();
-
+
-	gTotalContactPoints = 0;
+	gTotalContactPoints = 0;
-	glutSwapBuffers();
+	glutSwapBuffers();
-
+
-}
+}
-
+
-
+
-
+
-void MultiThreadedDemo::displayCallback(void) {
+void MultiThreadedDemo::displayCallback(void) {
-
+
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 
-
+
 	//optional but useful: debug drawing
 	if (m_dynamicsWorld)
 		m_dynamicsWorld->debugDrawWorld();
-
+
-	
+	
-	renderme();
+	renderme();
-
+
-	glFlush();
+	glFlush();
-	glutSwapBuffers();
+	glutSwapBuffers();
-}
+}
-
+
-
+
-
+
-
+
-
+
-void	MultiThreadedDemo::initPhysics()
+void	MultiThreadedDemo::initPhysics()
-{
+{
-#ifdef USE_PARALLEL_DISPATCHER
+#ifdef USE_PARALLEL_DISPATCHER
-	m_threadSupportSolver = 0;
+	m_threadSupportSolver = 0;
-	m_threadSupportCollision = 0;
+	m_threadSupportCollision = 0;
-#endif
+#endif
-
+
-//#define USE_GROUND_PLANE 1
+//#define USE_GROUND_PLANE 1
-#ifdef USE_GROUND_PLANE
+#ifdef USE_GROUND_PLANE
-	m_collisionShapes.push_back(new btStaticPlaneShape(btVector3(0,1,0),0.5));
+	m_collisionShapes.push_back(new btStaticPlaneShape(btVector3(0,1,0),0.5));
-#else
+#else
-
+
-	///Please don't make the box sizes larger then 1000: the collision detection will be inaccurate.
+	///Please don't make the box sizes larger then 1000: the collision detection will be inaccurate.
-	///See http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=346
+	///See http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=346
-	m_collisionShapes.push_back(new btBoxShape (btVector3(200,CUBE_HALF_EXTENTS,200)));
+	m_collisionShapes.push_back(new btBoxShape (btVector3(200,CUBE_HALF_EXTENTS,200)));
-#endif
+#endif
-
+
-	m_collisionShapes.push_back(new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)));
+	m_collisionShapes.push_back(new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)));
-	
+	
-
+
-
+
-	setCameraDistance(32.5f);
+	setCameraDistance(32.5f);
-
+
-	m_azi = 90.f;
+	m_azi = 90.f;
-
+
-	m_dispatcher=0;
+	m_dispatcher=0;
-	m_collisionConfiguration = new btDefaultCollisionConfiguration();
+	m_collisionConfiguration = new btDefaultCollisionConfiguration();
-	
+	
-#ifdef USE_PARALLEL_DISPATCHER
+#ifdef USE_PARALLEL_DISPATCHER
-	int maxNumOutstandingTasks = 4;
+	int maxNumOutstandingTasks = 4;
-
+
-#ifdef USE_WIN32_THREADING
+#ifdef USE_WIN32_THREADING
-
+
-m_threadSupportCollision = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo(
+m_threadSupportCollision = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo(
-								"collision",
+								"collision",
-								processCollisionTask,
+								processCollisionTask,
-								createCollisionLocalStoreMemory,
+								createCollisionLocalStoreMemory,
-								maxNumOutstandingTasks));
+								maxNumOutstandingTasks));
-#else
+#else
-
+
-#ifdef USE_LIBSPE2
+#ifdef USE_LIBSPE2
-
+
-   spe_program_handle_t * program_handle;
+   spe_program_handle_t * program_handle;
-#ifndef USE_CESOF
+#ifndef USE_CESOF
-                        program_handle = spe_image_open ("./spuCollision.elf");
+                        program_handle = spe_image_open ("./spuCollision.elf");
-                        if (program_handle == NULL)
+                        if (program_handle == NULL)
-                    {
+                    {
-                                perror( "SPU OPEN IMAGE ERROR\n");
+                                perror( "SPU OPEN IMAGE ERROR\n");
-                    }
+                    }
-                        else
+                        else
-                        {
+                        {
-                                printf( "IMAGE OPENED\n");
+                                printf( "IMAGE OPENED\n");
-                        }
+                        }
-#else
+#else
-                        extern spe_program_handle_t spu_program;
+                        extern spe_program_handle_t spu_program;
-                        program_handle = &spu_program;
+                        program_handle = &spu_program;
-#endif
+#endif
-        SpuLibspe2Support* threadSupportCollision  = new SpuLibspe2Support( program_handle, maxNumOutstandingTasks);
+        SpuLibspe2Support* threadSupportCollision  = new SpuLibspe2Support( program_handle, maxNumOutstandingTasks);
-#elif defined (USE_PTHREADS)
+#elif defined (USE_PTHREADS)
-    PosixThreadSupport::ThreadConstructionInfo constructionInfo("collision",
+    PosixThreadSupport::ThreadConstructionInfo constructionInfo("collision",
-								processCollisionTask,
+								processCollisionTask,
-								createCollisionLocalStoreMemory,
+								createCollisionLocalStoreMemory,
-								maxNumOutstandingTasks);
+								maxNumOutstandingTasks);
-    m_threadSupportCollision = new PosixThreadSupport(constructionInfo);
+    m_threadSupportCollision = new PosixThreadSupport(constructionInfo);
-#else
+#else
-
+
-	SequentialThreadSupport::SequentialThreadConstructionInfo colCI("collision",processCollisionTask,createCollisionLocalStoreMemory);
+	SequentialThreadSupport::SequentialThreadConstructionInfo colCI("collision",processCollisionTask,createCollisionLocalStoreMemory);
-	SequentialThreadSupport* m_threadSupportCollision = new SequentialThreadSupport(colCI);
+	SequentialThreadSupport* m_threadSupportCollision = new SequentialThreadSupport(colCI);
-		
+		
-#endif //USE_LIBSPE2
+#endif //USE_LIBSPE2
-
+
-///Playstation 3 SPU (SPURS)  version is available through PS3 Devnet
+///Playstation 3 SPU (SPURS)  version is available through PS3 Devnet
-/// For Unix/Mac someone could implement a pthreads version of btThreadSupportInterface?
+/// For Unix/Mac someone could implement a pthreads version of btThreadSupportInterface?
-///you can hook it up to your custom task scheduler by deriving from btThreadSupportInterface
+///you can hook it up to your custom task scheduler by deriving from btThreadSupportInterface
-#endif
+#endif
-
+
-
+
-	m_dispatcher = new	SpuGatheringCollisionDispatcher(m_threadSupportCollision,maxNumOutstandingTasks,m_collisionConfiguration);
+	m_dispatcher = new	SpuGatheringCollisionDispatcher(m_threadSupportCollision,maxNumOutstandingTasks,m_collisionConfiguration);
-//	m_dispatcher = new	btCollisionDispatcher(m_collisionConfiguration);
+//	m_dispatcher = new	btCollisionDispatcher(m_collisionConfiguration);
-#else
+#else
-	
+	
-	m_dispatcher = new	btCollisionDispatcher(m_collisionConfiguration);
+	m_dispatcher = new	btCollisionDispatcher(m_collisionConfiguration);
-#endif //USE_PARALLEL_DISPATCHER
+#endif //USE_PARALLEL_DISPATCHER
-
+
-
+
-	btVector3 worldAabbMin(-1000,-1000,-1000);
+	btVector3 worldAabbMin(-1000,-1000,-1000);
-	btVector3 worldAabbMax(1000,1000,1000);
+	btVector3 worldAabbMax(1000,1000,1000);
-
+
-	m_broadphase = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies);
+	m_broadphase = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies);
-
+
-
+
-	
+	
-#ifdef USE_PARALLEL_SOLVER
+#ifdef USE_PARALLEL_SOLVER
-
+
-#ifdef USE_WIN32_THREADING
+#ifdef USE_WIN32_THREADING
-	m_threadSupportSolver = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo(
+	m_threadSupportSolver = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo(
-								"solver",
+								"solver",
-								processSolverTask,
+								processSolverTask,
-								createSolverLocalStoreMemory,
+								createSolverLocalStoreMemory,
-								maxNumOutstandingTasks));
+								maxNumOutstandingTasks));
-#elif defined (USE_PTHREADS)
+#elif defined (USE_PTHREADS)
-	PosixThreadSupport::ThreadConstructionInfo solverConstructionInfo("solver", processSolverTask,
+	PosixThreadSupport::ThreadConstructionInfo solverConstructionInfo("solver", processSolverTask,
-									createSolverLocalStoreMemory, maxNumOutstandingTasks);
+									createSolverLocalStoreMemory, maxNumOutstandingTasks);
-
+
-    	m_threadSupportSolver = new PosixThreadSupport(solverConstructionInfo);
+    	m_threadSupportSolver = new PosixThreadSupport(solverConstructionInfo);
-#else
+#else
-	//for now use sequential version	
+	//for now use sequential version	
-	SequentialThreadSupport::SequentialThreadConstructionInfo solverCI("solver",processSolverTask,createSolverLocalStoreMemory);
+	SequentialThreadSupport::SequentialThreadConstructionInfo solverCI("solver",processSolverTask,createSolverLocalStoreMemory);
-	m_threadSupportSolver = new SequentialThreadSupport(solverCI);
+	m_threadSupportSolver = new SequentialThreadSupport(solverCI);
-
+
-#endif //USE_WIN32_THREADING
+#endif //USE_WIN32_THREADING
-	m_solver = new btParallelSequentialImpulseSolver(m_threadSupportSolver,maxNumOutstandingTasks);
+	m_solver = new btParallelSequentialImpulseSolver(m_threadSupportSolver,maxNumOutstandingTasks);
-
+
-#else
+#else
-
+
-	btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver();
+	btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver();
-
+
-	m_solver = solver;
+	m_solver = solver;
-	//default solverMode is SOLVER_RANDMIZE_ORDER. Warmstarting seems not to improve convergence, see 
+	//default solverMode is SOLVER_RANDMIZE_ORDER. Warmstarting seems not to improve convergence, see 
-	//solver->setSolverMode(0);//btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
+	//solver->setSolverMode(0);//btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
-	
+	
-#endif //USE_PARALLEL_SOLVER
+#endif //USE_PARALLEL_SOLVER
-
+
-		btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
+		btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
-		m_dynamicsWorld = world;
+		m_dynamicsWorld = world;
-
+
-		world->getSolverInfo().m_numIterations = 4;
+		world->getSolverInfo().m_numIterations = 4;
-
+
-		m_dynamicsWorld->getDispatchInfo().m_enableSPU = true;
+		m_dynamicsWorld->getDispatchInfo().m_enableSPU = true;
-		m_dynamicsWorld->setGravity(btVector3(0,-10,0));
+		m_dynamicsWorld->setGravity(btVector3(0,-10,0));
-
+
-
+
-
+
-	int i;
+	int i;
-
+
-	btTransform tr;
+	btTransform tr;
-	tr.setIdentity();
+	tr.setIdentity();
-
+
-	
+	
-	for (i=0;i<gNumObjects;i++)
+	for (i=0;i<gNumObjects;i++)
-	{
+	{
-		if (i>0)
+		if (i>0)
-		{
+		{
-			shapeIndex[i] = 1;//sphere
+			shapeIndex[i] = 1;//sphere
-		}
+		}
-		else
+		else
-			shapeIndex[i] = 0;
+			shapeIndex[i] = 0;
-	}
+	}
-
+
-
+
-	btTransform trans;
+	btTransform trans;
-	trans.setIdentity();
+	trans.setIdentity();
-	
+	
-	btScalar halfExtents = CUBE_HALF_EXTENTS;
+	btScalar halfExtents = CUBE_HALF_EXTENTS;
-
+
-	trans.setOrigin(btVector3(0,-halfExtents,0));
+	trans.setOrigin(btVector3(0,-halfExtents,0));
-
+
-
+
-
+
-	localCreateRigidBody(0.f,trans,m_collisionShapes[shapeIndex[0]]);
+	localCreateRigidBody(0.f,trans,m_collisionShapes[shapeIndex[0]]);
-
+
-	int numWalls = 15;
+	int numWalls = 15;
-	int wallHeight = 15;
+	int wallHeight = 15;
-	float wallDistance = 3;
+	float wallDistance = 3;
-
+
-
+
-	for ( i=0;i<numWalls;i++)
+	for ( i=0;i<numWalls;i++)
-	{
+	{
-		float zPos = (i-numWalls/2) * wallDistance;
+		float zPos = (i-numWalls/2) * wallDistance;
-		createStack(m_collisionShapes[shapeIndex[1]],halfExtents,wallHeight,zPos);
+		createStack(m_collisionShapes[shapeIndex[1]],halfExtents,wallHeight,zPos);
-	}
+	}
-#define DESTROYER_BALL 1
+#define DESTROYER_BALL 1
-#ifdef DESTROYER_BALL
+#ifdef DESTROYER_BALL
-	btTransform sphereTrans;
+	btTransform sphereTrans;
-	sphereTrans.setIdentity();
+	sphereTrans.setIdentity();
-	sphereTrans.setOrigin(btVector3(0,2,40));
+	sphereTrans.setOrigin(btVector3(0,2,40));
-	btSphereShape* ball = new btSphereShape(2.f);
+	btSphereShape* ball = new btSphereShape(2.f);
-	m_collisionShapes.push_back(ball);
+	m_collisionShapes.push_back(ball);
-	btRigidBody* ballBody = localCreateRigidBody(10000.f,sphereTrans,ball);
+	btRigidBody* ballBody = localCreateRigidBody(10000.f,sphereTrans,ball);
-	ballBody->setLinearVelocity(btVector3(0,0,-10));
+	ballBody->setLinearVelocity(btVector3(0,0,-10));
-#endif 
+#endif 
-//	clientResetScene();
+//	clientResetScene();
-
+
-
+
-}
+}
-	
+	
-
+
-
+
-
+
-
+
-
+
-void	MultiThreadedDemo::exitPhysics()
+void	MultiThreadedDemo::exitPhysics()
-{
+{
-
+
-	//cleanup in the reverse order of creation/initialization
+	//cleanup in the reverse order of creation/initialization
-
+
-	//remove the rigidbodies from the dynamics world and delete them
+	//remove the rigidbodies from the dynamics world and delete them
-	int i;
+	int i;
-	for (i=m_dynamicsWorld->getNumCollisionObjects()-1; i>=0 ;i--)
+	for (i=m_dynamicsWorld->getNumCollisionObjects()-1; i>=0 ;i--)
-	{
+	{
-		btCollisionObject* obj = m_dynamicsWorld->getCollisionObjectArray()[i];
+		btCollisionObject* obj = m_dynamicsWorld->getCollisionObjectArray()[i];
-		btRigidBody* body = btRigidBody::upcast(obj);
+		btRigidBody* body = btRigidBody::upcast(obj);
-		if (body && body->getMotionState())
+		if (body && body->getMotionState())
-		{
+		{
-			delete body->getMotionState();
+			delete body->getMotionState();
-		}
+		}
-		m_dynamicsWorld->removeCollisionObject( obj );
+		m_dynamicsWorld->removeCollisionObject( obj );
-		delete obj;
+		delete obj;
-	}
+	}
-
+
-	//delete collision shapes
+	//delete collision shapes
-	for (int j=0;j<m_collisionShapes.size();j++)
+	for (int j=0;j<m_collisionShapes.size();j++)
-	{
+	{
-		btCollisionShape* shape = m_collisionShapes[j];
+		btCollisionShape* shape = m_collisionShapes[j];
-		m_collisionShapes[j] = 0;
+		m_collisionShapes[j] = 0;
-		delete shape;
+		delete shape;
-	}
+	}
-
+
-	//delete dynamics world
+	//delete dynamics world
-	delete m_dynamicsWorld;
+	delete m_dynamicsWorld;
-
+
-	//delete solver
+	//delete solver
-	delete m_solver;
+	delete m_solver;
-#ifdef USE_PARALLEL_DISPATCHER
+#ifdef USE_PARALLEL_DISPATCHER
-	if (m_threadSupportSolver)
+	if (m_threadSupportSolver)
-	{
+	{
-		delete m_threadSupportSolver;
+		delete m_threadSupportSolver;
-	}
+	}
-#endif
+#endif
-
+
-	//delete broadphase
+	//delete broadphase
-	delete m_broadphase;
+	delete m_broadphase;
-
+
-	//delete dispatcher
+	//delete dispatcher
-	delete m_dispatcher;
+	delete m_dispatcher;
-
+
-#ifdef USE_PARALLEL_DISPATCHER
+#ifdef USE_PARALLEL_DISPATCHER
-	if (m_threadSupportCollision)
+	if (m_threadSupportCollision)
-	{
+	{
-		delete m_threadSupportCollision;
+		delete m_threadSupportCollision;
-	}
+	}
-#endif
+#endif
-
+
-	delete m_collisionConfiguration;
+	delete m_collisionConfiguration;
-
+
-	
+	
-}
+}
-
+
-
+

msvc/6/appAllBulletDemos.dsp

@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dll6\build\appAllBulletDemos\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -103,11 +103,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appAllBulletDemos\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -132,11 +132,11 @@ 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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -160,11 +160,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dll6\build\appAllBulletDemos\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -188,11 +188,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appAllBulletDemos\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

msvc/6/appEPAPenDepthDemo.dsp

@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /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\GIMPACT\include"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dll6\build\appEPAPenDepthDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -103,11 +103,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appEPAPenDepthDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -132,11 +132,11 @@ 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\GIMPACT\include"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -160,11 +160,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dll6\build\appEPAPenDepthDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -188,11 +188,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appEPAPenDepthDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

msvc/6/appGimpactTestDemo.dsp

@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dll6\build\appGimpactTestDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -103,11 +103,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appGimpactTestDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -132,11 +132,11 @@ 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\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -160,11 +160,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dll6\build\appGimpactTestDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -188,11 +188,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appGimpactTestDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

msvc/6/appMovingConcaveDemo.dsp

@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /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\GIMPACT\include"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dll6\build\appMovingConcaveDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -103,11 +103,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appMovingConcaveDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -132,11 +132,11 @@ 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\GIMPACT\include"
+# 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 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -160,11 +160,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dll6\build\appMovingConcaveDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -188,11 +188,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appMovingConcaveDemo\"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /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 "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

msvc/6/libGIMPACT.dsp

@@ -1,269 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libGIMPACT" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libGIMPACT - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libGIMPACT.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libGIMPACT.mak" CFG="libGIMPACT - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libGIMPACT - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACT - Win32 DebugDll" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACT - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACT - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACT - Win32 ReleaseDll" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACT - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libGIMPACT - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "release"
-# PROP BASE Intermediate_Dir "release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\out\release6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\release6\build\libGIMPACT\"
-# 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"
-# 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libGIMPACT.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libGIMPACT - Win32 ReleaseDll"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "release_dll"
-# PROP BASE Intermediate_Dir "release_dll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\release_dll6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\release_dll6\build\libGIMPACT\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libGIMPACT - Win32 ReleaseDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "release_dbl"
-# PROP BASE Intermediate_Dir "release_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\release_dbl6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libGIMPACT\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libGIMPACT - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "debug"
-# PROP BASE Intermediate_Dir "debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\out\debug6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\debug6\build\libGIMPACT\"
-# 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"
-# 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libGIMPACT_d.lib"
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libGIMPACT - Win32 DebugDll"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "debug_dll"
-# PROP BASE Intermediate_Dir "debug_dll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\debug_dll6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\debug_dll6\build\libGIMPACT\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ELSEIF  "$(CFG)" == "libGIMPACT - Win32 DebugDoublePrecision"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 
-# PROP BASE Output_Dir "debug_dbl"
-# PROP BASE Intermediate_Dir "debug_dbl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 
-# PROP Output_Dir "..\..\out\debug_dbl6\build\libGIMPACT\"
-# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libGIMPACT\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libGIMPACT\libGIMPACT.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
-# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib   /nologo /version:4.0 /machine:I386  /subsystem:windows  
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libGIMPACT - Win32 Release"
-# Name "libGIMPACT - Win32 ReleaseDll"
-# Name "libGIMPACT - Win32 ReleaseDoublePrecision"
-# Name "libGIMPACT - Win32 Debug"
-# Name "libGIMPACT - Win32 DebugDll"
-# Name "libGIMPACT - Win32 DebugDoublePrecision"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactQuantizedBvh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\Bullet\btTriangleShapeEx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\core\gim_box_set.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\core\gim_contact.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\core\gim_memory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp
-# End Source File
-# End Group
-# End Target
-# End Project

msvc/6/libbulletcollision.dsp

@@ -466,6 +466,50 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_box_set.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_contact.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_memory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp
 # End Source File
 # Begin Source File
@@ -790,6 +834,114 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\Gimpact\btBoxCollision.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btClipPolygon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btContactProcessing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGeometryOperations.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactBvh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactMassUtil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btGImpactShape.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btQuantization.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_basic_geometry_operations.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_bitset.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_box_collision.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_box_set.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_clip_polygon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_contact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_geom_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_geometry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_hash_table.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_linear_math.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_math.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_memory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_radixsort.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletCollision\Gimpact\gim_tri_collision.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h
 # End Source File
 # Begin Source File

msvc/6/libbulletmultithreaded.dsp

@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /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\BulletMultiThreaded"
+# 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"
 # 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -76,11 +76,11 @@ 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 /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\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /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"
 # 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
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -105,11 +105,11 @@ 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 /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -134,11 +134,11 @@ 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\BulletMultiThreaded"
+# 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"
 # 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -163,11 +163,11 @@ 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 /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\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /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"
 # 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
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -192,11 +192,11 @@ 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 /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -222,95 +222,95 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\btThreadSupportInterface.cpp
+SOURCE=..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\PosixThreadSupport.cpp
+SOURCE=..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SequentialThreadSupport.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuBatchRaycaster.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuCollisionTaskProcess.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuFakeDma.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuFakeDma.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuLibspe2Support.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuParallelSolver.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuRaycastTaskProcess.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuSampleTaskProcess.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp
+SOURCE=..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\Win32ThreadSupport.cpp
+SOURCE=..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -318,51 +318,51 @@ SOURCE=..\..\Extras\BulletMultiThreaded\Win32ThreadSupport.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h
+SOURCE=..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h
 # End Source File
 # End Group
 # End Target

msvc/6/wksbullet.dsw

@@ -30,9 +30,6 @@ Package=<4>
     Project_Dep_Name libconvexdecomposition
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
     Begin Project Dependency
@@ -410,9 +407,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libbulletopenglsupport
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -489,9 +483,6 @@ Package=<4>
     Project_Dep_Name libconvexdecomposition
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
 }}}
@@ -563,9 +554,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libbulletopenglsupport
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -921,9 +909,6 @@ Package=<4>
     Project_Dep_Name libconvexdecomposition
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
     Begin Project Dependency
@@ -1077,9 +1062,6 @@ Package=<4>
     Project_Dep_Name libconvexdecomposition
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libGIMPACT
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libGIMPACTUtils
     End Project Dependency
     Begin Project Dependency
@@ -1200,18 +1182,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libGIMPACT"=.\libGIMPACT.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libGIMPACTUtils"=.\libGIMPACTUtils.dsp - Package Owner=<4>
 
 Package=<5>

msvc/7/appAllBulletDemos.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release7\build\appAllBulletDemos\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dll7\build\appAllBulletDemos\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dbl7\build\appAllBulletDemos\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug7\build\appAllBulletDemos\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dll7\build\appAllBulletDemos\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dbl7\build\appAllBulletDemos\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/7/appEPAPenDepthDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release7\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dll7\build\appEPAPenDepthDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dbl7\build\appEPAPenDepthDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug7\build\appEPAPenDepthDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dll7\build\appEPAPenDepthDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dbl7\build\appEPAPenDepthDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/7/appGimpactTestDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release7\build\appGimpactTestDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dll7\build\appGimpactTestDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl7\build\appGimpactTestDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug7\build\appGimpactTestDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dll7\build\appGimpactTestDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl7\build\appGimpactTestDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/7/appMovingConcaveDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release7\build\appMovingConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dll7\build\appMovingConcaveDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dbl7\build\appMovingConcaveDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug7\build\appMovingConcaveDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dll7\build\appMovingConcaveDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dbl7\build\appMovingConcaveDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/7/libGIMPACT.vcproj

@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="libGIMPACT"
-	ProjectGUID="{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release7\build\libGIMPACT\"
-				ObjectFile="..\..\out\release7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release7\libs\libGIMPACT.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDll|Win32"
-			OutputDirectory="..\..\out\release_dll7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dll7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="2"
-                                StringPooling="TRUE"
-                                EnableFunctionLevelLinking="TRUE"
-                                RuntimeLibrary="2"
-                                DebugInformationFormat="3"
-                                BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dll7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dll7\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dll7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dll7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dll7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dll7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dbl7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dbl7\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dbl7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dbl7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug7\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug7\libs\libGIMPACT_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDll|Win32"
-			OutputDirectory="..\..\out\debug_dll7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dll7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dll7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dll7\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dll7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dll7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dll7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dll7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl7\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dbl7\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl7\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dbl7\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl7\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl7\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl7\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactQuantizedBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btTriangleShapeEx.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/7/libbulletcollision.vcproj

@@ -602,6 +602,39 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp">
 			</File>
@@ -846,6 +879,87 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btBoxCollision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btClipPolygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGeometryOperations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactMassUtil.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btQuantization.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_array.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_basic_geometry_operations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_bitset.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_collision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_clip_polygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geom_types.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geometry.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_hash_table.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_linear_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_radixsort.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h">
 			</File>

msvc/7/libbulletmultithreaded.vcproj

@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release7\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll7\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl7\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug7\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll7\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl7\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -420,113 +420,113 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\btThreadSupportInterface.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\PosixThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SequentialThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuBatchRaycaster.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuFakeDma.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuLibspe2Support.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuParallelSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\Win32ThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
 			</File>
 		</Filter>
 	</Files>

msvc/7/wksbullet.sln

@@ -86,8 +86,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcollada
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
@@ -110,9 +108,8 @@ Global
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -177,7 +174,6 @@ Global
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -191,8 +187,7 @@ Global
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
 		{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}
@@ -204,7 +199,6 @@ Global
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -283,10 +277,9 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
@@ -327,10 +320,9 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -849,18 +841,6 @@ Global
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDll.Build.0 = DebugDll|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.ActiveCfg = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.Build.0 = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.ActiveCfg = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.Build.0 = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.ActiveCfg = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.ActiveCfg = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.Build.0 = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.ActiveCfg = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.Build.0 = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.ReleaseDll.ActiveCfg = ReleaseDll|Win32

msvc/71/appAllBulletDemos.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release71\build\appAllBulletDemos\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dll71\build\appAllBulletDemos\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dbl71\build\appAllBulletDemos\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug71\build\appAllBulletDemos\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dll71\build\appAllBulletDemos\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dbl71\build\appAllBulletDemos\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/71/appEPAPenDepthDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release71\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dll71\build\appEPAPenDepthDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dbl71\build\appEPAPenDepthDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug71\build\appEPAPenDepthDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dll71\build\appEPAPenDepthDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dbl71\build\appEPAPenDepthDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/71/appGimpactTestDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release71\build\appGimpactTestDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dll71\build\appGimpactTestDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl71\build\appGimpactTestDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug71\build\appGimpactTestDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dll71\build\appGimpactTestDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl71\build\appGimpactTestDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/71/appMovingConcaveDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release71\build\appMovingConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dll71\build\appMovingConcaveDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dbl71\build\appMovingConcaveDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug71\build\appMovingConcaveDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dll71\build\appMovingConcaveDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dbl71\build\appMovingConcaveDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/71/libGIMPACT.vcproj

@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="libGIMPACT"
-	ProjectGUID="{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release71\build\libGIMPACT\"
-				ObjectFile="..\..\out\release71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release71\libs\libGIMPACT.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDll|Win32"
-			OutputDirectory="..\..\out\release_dll71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dll71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="2"
-                                StringPooling="TRUE"
-                                EnableFunctionLevelLinking="TRUE"
-                                RuntimeLibrary="2"
-                                DebugInformationFormat="3"
-                                BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dll71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dll71\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dll71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dll71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dll71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dll71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dbl71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dbl71\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dbl71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dbl71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug71\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug71\libs\libGIMPACT_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDll|Win32"
-			OutputDirectory="..\..\out\debug_dll71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dll71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dll71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dll71\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dll71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dll71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dll71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dll71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl71\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dbl71\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl71\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dbl71\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl71\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl71\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl71\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactQuantizedBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btTriangleShapeEx.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/71/libbulletcollision.vcproj

@@ -602,6 +602,39 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp">
 			</File>
@@ -846,6 +879,87 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btBoxCollision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btClipPolygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGeometryOperations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactMassUtil.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btQuantization.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_array.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_basic_geometry_operations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_bitset.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_collision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_clip_polygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geom_types.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geometry.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_hash_table.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_linear_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_radixsort.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h">
 			</File>

msvc/71/libbulletmultithreaded.vcproj

@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release71\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll71\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl71\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug71\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll71\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl71\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -420,113 +420,113 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\btThreadSupportInterface.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\PosixThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SequentialThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuBatchRaycaster.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuFakeDma.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuLibspe2Support.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuParallelSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\Win32ThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
 			</File>
 		</Filter>
 	</Files>

msvc/71/wksbullet.sln

@@ -86,8 +86,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcollada
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
@@ -110,9 +108,8 @@ Global
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -177,7 +174,6 @@ Global
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -191,8 +187,7 @@ Global
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
 		{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}
@@ -204,7 +199,6 @@ Global
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -283,10 +277,9 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
@@ -327,10 +320,9 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -849,18 +841,6 @@ Global
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDll.Build.0 = DebugDll|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.ActiveCfg = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.Build.0 = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.ActiveCfg = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.Build.0 = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.ActiveCfg = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.ActiveCfg = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.Build.0 = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.ActiveCfg = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.Build.0 = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.ReleaseDll.ActiveCfg = ReleaseDll|Win32

msvc/8/appAllBulletDemos.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release8\build\appAllBulletDemos\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dll8\build\appAllBulletDemos\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\release_dbl8\build\appAllBulletDemos\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug8\build\appAllBulletDemos\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dll8\build\appAllBulletDemos\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\appAllBulletDemos\"
 				ObjectFile="..\..\out\debug_dbl8\build\appAllBulletDemos\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/8/appEPAPenDepthDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release8\build\appEPAPenDepthDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dll8\build\appEPAPenDepthDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\release_dbl8\build\appEPAPenDepthDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug8\build\appEPAPenDepthDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dll8\build\appEPAPenDepthDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appEPAPenDepthDemo\appEPAPenDepthDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\appEPAPenDepthDemo\"
 				ObjectFile="..\..\out\debug_dbl8\build\appEPAPenDepthDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/8/appGimpactTestDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release8\build\appGimpactTestDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dll8\build\appGimpactTestDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl8\build\appGimpactTestDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug8\build\appGimpactTestDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dll8\build\appGimpactTestDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl8\build\appGimpactTestDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/8/appMovingConcaveDemo.vcproj

@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release8\build\appMovingConcaveDemo\"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dll8\build\appMovingConcaveDemo\"
@@ -150,7 +150,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -171,7 +171,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\release_dbl8\build\appMovingConcaveDemo\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -240,7 +240,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug8\build\appMovingConcaveDemo\"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -312,7 +312,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dll8\build\appMovingConcaveDemo\"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -381,7 +381,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\appMovingConcaveDemo\"
 				ObjectFile="..\..\out\debug_dbl8\build\appMovingConcaveDemo\"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>

msvc/8/libGIMPACT.vcproj

@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libGIMPACT"
-	ProjectGUID="{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\out\release8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				StringPooling="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeLibrary="0"
-				DebugInformationFormat="3"
-				BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release8\build\libGIMPACT\"
-				ObjectFile="..\..\out\release8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\release8\libs\libGIMPACT.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDll|Win32"
-			OutputDirectory="..\..\out\release_dll8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dll8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="2"
-                                StringPooling="TRUE"
-                                EnableFunctionLevelLinking="TRUE"
-                                RuntimeLibrary="2"
-                                DebugInformationFormat="3"
-                                BufferSecurityCheck="FALSE"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dll8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dll8\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dll8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dll8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dll8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dll8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDoublePrecision|Win32"
-			OutputDirectory="..\..\out\release_dbl8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\release_dbl8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\release_dbl8\build\libGIMPACT\"
-				ObjectFile="..\..\out\release_dbl8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\release_dbl8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\release_dbl8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\release_dbl8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\out\debug8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="TRUE"
-				DebugInformationFormat="4"
-				RuntimeTypeInfo="FALSE"
-				RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug8\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				IgnoreDefaultLibraryNames="LIBC,LIBCD"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\out\debug8\libs\libGIMPACT_d.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDll|Win32"
-			OutputDirectory="..\..\out\debug_dll8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dll8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dll8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dll8\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dll8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dll8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dll8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dll8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDoublePrecision|Win32"
-			OutputDirectory="..\..\out\debug_dbl8\build\libGIMPACT\"
-			IntermediateDirectory="..\..\out\debug_dbl8\build\libGIMPACT\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-                                Optimization="0"
-                                MinimalRebuild="TRUE"
-                                DebugInformationFormat="4"
-                                RuntimeTypeInfo="FALSE"
-                                RuntimeLibrary="1"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
-				OptimizeForProcessor="1"
-				ExceptionHandling="0"
-				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libGIMPACT\libGIMPACT.pch"
-				AssemblerListingLocation="..\..\out\debug_dbl8\build\libGIMPACT\"
-				ObjectFile="..\..\out\debug_dbl8\build\libGIMPACT\"
-				ProgramDataBaseFileName="..\..\out\debug_dbl8\build\libGIMPACT\GIMPACT.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				TreatWChar_tAsBuiltInType="false"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" "
-				AdditionalDependencies=""
-				IgnoreImportLibrary="TRUE"
-				SuppressStartupBanner="TRUE"
-				GenerateManifest="false"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="..\..\out\debug_dbl8\build\libGIMPACT\GIMPACT.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCLibrarianTool"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName="..\..\out\debug_dbl8\build\libGIMPACT\libGIMPACT.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactQuantizedBvh.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btTriangleShapeEx.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

msvc/8/libbulletcollision.vcproj

@@ -602,6 +602,39 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp">
 			</File>
@@ -846,6 +879,87 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btBoxCollision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btClipPolygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btContactProcessing.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGeometryOperations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactMassUtil.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btGImpactShape.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btQuantization.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_array.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_basic_geometry_operations.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_bitset.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_collision.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_box_set.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_clip_polygon.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_contact.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geom_types.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_geometry.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_hash_table.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_linear_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_math.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_memory.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_radixsort.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\Gimpact\gim_tri_collision.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h">
 			</File>

msvc/8/libbulletmultithreaded.vcproj

@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release8\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll8\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl8\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug8\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll8\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl8\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -420,113 +420,113 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\btThreadSupportInterface.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\PosixThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SequentialThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuBatchRaycaster.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuFakeDma.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuLibspe2Support.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuParallelSolver.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\Win32ThreadSupport.cpp">
+				RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h">
 			</File>
 			<File
-				RelativePath="..\..\Extras\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
+				RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h">
 			</File>
 		</Filter>
 	</Files>

msvc/8/wksbullet.sln

@@ -86,8 +86,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcollada
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTUtils", "libGIMPACTUtils.vcproj", "{B1B5F775-54A9-2437-E4AC-7E817E492142}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglui", "libglui.vcproj", "{81819498-F4A8-E0CA-8ED5-724E27AB34E7}"
@@ -110,9 +108,8 @@ Global
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -177,7 +174,6 @@ Global
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -191,8 +187,7 @@ Global
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
 		{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}
@@ -204,7 +199,6 @@ Global
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
 		{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
 		{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}
@@ -283,10 +277,9 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.37 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{6210A080-01C0-6D67-F1DB-669393175402}.38 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{6210A080-01C0-6D67-F1DB-669393175402}.39 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{6210A080-01C0-6D67-F1DB-669393175402}.42 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940}
@@ -327,10 +320,9 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -849,18 +841,6 @@ Global
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDll.Build.0 = DebugDll|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
 		{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.ActiveCfg = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.Build.0 = Release|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.ActiveCfg = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDll.Build.0 = ReleaseDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.ActiveCfg = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.ActiveCfg = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDll.Build.0 = DebugDll|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
-		{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.ActiveCfg = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.Release.Build.0 = Release|Win32
 		{B1B5F775-54A9-2437-E4AC-7E817E492142}.ReleaseDll.ActiveCfg = ReleaseDll|Win32

src/BulletCollision/Gimpact/btGImpactShape.h

@@ -105,6 +105,7 @@ protected:
 public:
 	btGImpactShapeInterface()
 	{
+		m_shapeType=GIMPACT_SHAPE_PROXYTYPE;
 		m_localAABB.invalidate();
 		m_needs_update = true;
 		localScaling.setValue(1.f,1.f,1.f);

src/BulletMultiThreaded/Win32ThreadSupport.h

@@ -114,6 +114,10 @@ public:
 ///tell the task scheduler we are done with the SPU tasks
 	virtual	void stopSPU();
 
+	virtual	void	setNumTasks(int numTasks)
+	{
+	}
+
 };
 
 #endif //WIN32_THREAD_SUPPORT_H