diff --git a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp index 0c540ba15..caf8a5b82 100644 --- a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp +++ b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp @@ -1,478 +1,478 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -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. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -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. -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. -*/ - -//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver -#define USE_PARALLEL_DISPATCHER 1 - -#include "btBulletDynamicsCommon.h" -#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" -#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" - -#ifdef USE_PARALLEL_DISPATCHER -#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h" -#include "BulletMultiThreaded/PlatformDefinitions.h" - -#ifdef USE_LIBSPE2 -#include "BulletMultiThreaded/SpuLibspe2Support.h" -#elif defined (WIN32) -#include "BulletMultiThreaded/Win32ThreadSupport.h" -#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" - -#elif defined (USE_PTHREADS) - -#include "BulletMultiThreaded/PosixThreadSupport.h" -#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" - -#else -//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added) -#include "BulletMultiThreaded/SequentialThreadSupport.h" -#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" -#endif //USE_LIBSPE2 - -#ifdef USE_PARALLEL_SOLVER -#include "BulletMultiThreaded/SpuParallelSolver.h" -#include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h" -#endif //USE_PARALLEL_SOLVER - -#endif//USE_PARALLEL_DISPATCHER - - -#include "LinearMath/btQuickprof.h" -#include "LinearMath/btIDebugDraw.h" - - -#include "BMF_Api.h" -#include //printf debugging - -#include "MultiThreadedDemo.h" -#include "GL_ShapeDrawer.h" - -#include "GlutStuff.h" - - -extern float eye[3]; -extern int glutScreenWidth; -extern int glutScreenHeight; - -const int maxProxies = 32766; -const int maxOverlap = 65535; - - - - -#ifdef _DEBUG -const int gNumObjects = 120; -#else -const int gNumObjects = 120;//try this in release mode: 3000. never go above 16384, unless you increate maxNumObjects value in DemoApplication.cp -#endif - - -const int maxNumObjects = 32760; - -static int shapeIndex[maxNumObjects]; - - -#define CUBE_HALF_EXTENTS 0.5 - -#define EXTRA_HEIGHT -10.f -//GL_LineSegmentShape shapeE(btPoint3(-50,0,0), -// btPoint3(50,0,0)); - - -void MultiThreadedDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos ) -{ - btTransform trans; - trans.setIdentity(); - - for(int i=0; istepSimulation(1.0f/60.f,0); - -#else - //during idle mode, just run 1 simulation step maximum - int maxSimSubSteps = m_idle ? 1 : 1; - if (m_idle) - dt = 1.0/420.f; - - int numSimSteps = 0; - numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps); - - //optional but useful: debug drawing - m_dynamicsWorld->debugDrawWorld(); - -#ifdef VERBOSE_TIMESTEPPING_CONSOLEOUTPUT - if (!numSimSteps) - printf("Interpolated transforms\n"); - else - { - if (numSimSteps > maxSimSubSteps) - { - //detect dropping frames - printf("Dropped (%i) simulation steps out of %i\n",numSimSteps - maxSimSubSteps,numSimSteps); - } else - { - printf("Simulated (%i) steps\n",numSimSteps); - } - } -#endif //VERBOSE_TIMESTEPPING_CONSOLEOUTPUT - -#endif - } - -#ifdef USE_QUICKPROF - btProfiler::beginBlock("render"); -#endif //USE_QUICKPROF - - renderme(); - - - //render the graphics objects, with center of mass shift - - updateCamera(); - - - -#ifdef USE_QUICKPROF - btProfiler::endBlock("render"); -#endif - glFlush(); - - gTotalContactPoints = 0; - glutSwapBuffers(); - -} - - - -void MultiThreadedDemo::displayCallback(void) { - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +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. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +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. +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. +*/ + +//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver +#define USE_PARALLEL_DISPATCHER 1 + +#include "btBulletDynamicsCommon.h" +#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" + +#ifdef USE_PARALLEL_DISPATCHER +#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h" +#include "BulletMultiThreaded/PlatformDefinitions.h" + +#ifdef USE_LIBSPE2 +#include "BulletMultiThreaded/SpuLibspe2Support.h" +#elif defined (WIN32) +#include "BulletMultiThreaded/Win32ThreadSupport.h" +#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" + +#elif defined (USE_PTHREADS) + +#include "BulletMultiThreaded/PosixThreadSupport.h" +#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" + +#else +//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added) +#include "BulletMultiThreaded/SequentialThreadSupport.h" +#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" +#endif //USE_LIBSPE2 + +#ifdef USE_PARALLEL_SOLVER +#include "BulletMultiThreaded/SpuParallelSolver.h" +#include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h" +#endif //USE_PARALLEL_SOLVER + +#endif//USE_PARALLEL_DISPATCHER + + +#include "LinearMath/btQuickprof.h" +#include "LinearMath/btIDebugDraw.h" + + +#include "BMF_Api.h" +#include //printf debugging + +#include "MultiThreadedDemo.h" +#include "GL_ShapeDrawer.h" + +#include "GlutStuff.h" + + +extern float eye[3]; +extern int glutScreenWidth; +extern int glutScreenHeight; + +const int maxProxies = 32766; +const int maxOverlap = 65535; + + + + +#ifdef _DEBUG +const int gNumObjects = 120; +#else +const int gNumObjects = 120;//try this in release mode: 3000. never go above 16384, unless you increate maxNumObjects value in DemoApplication.cp +#endif + + +const int maxNumObjects = 32760; + +static int shapeIndex[maxNumObjects]; + + +#define CUBE_HALF_EXTENTS 0.5 + +#define EXTRA_HEIGHT -10.f +//GL_LineSegmentShape shapeE(btPoint3(-50,0,0), +// btPoint3(50,0,0)); + + +void MultiThreadedDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos ) +{ + btTransform trans; + trans.setIdentity(); + + for(int i=0; istepSimulation(1.0f/60.f,0); + +#else + //during idle mode, just run 1 simulation step maximum + int maxSimSubSteps = m_idle ? 1 : 1; + if (m_idle) + dt = 1.0/420.f; + + int numSimSteps = 0; + numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps); + + //optional but useful: debug drawing + m_dynamicsWorld->debugDrawWorld(); + +#ifdef VERBOSE_TIMESTEPPING_CONSOLEOUTPUT + if (!numSimSteps) + printf("Interpolated transforms\n"); + else + { + if (numSimSteps > maxSimSubSteps) + { + //detect dropping frames + printf("Dropped (%i) simulation steps out of %i\n",numSimSteps - maxSimSubSteps,numSimSteps); + } else + { + printf("Simulated (%i) steps\n",numSimSteps); + } + } +#endif //VERBOSE_TIMESTEPPING_CONSOLEOUTPUT + +#endif + } + +#ifdef USE_QUICKPROF + btProfiler::beginBlock("render"); +#endif //USE_QUICKPROF + + renderme(); + + + //render the graphics objects, with center of mass shift + + updateCamera(); + + + +#ifdef USE_QUICKPROF + btProfiler::endBlock("render"); +#endif + glFlush(); + + gTotalContactPoints = 0; + glutSwapBuffers(); + +} + + + +void MultiThreadedDemo::displayCallback(void) { + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + //optional but useful: debug drawing if (m_dynamicsWorld) m_dynamicsWorld->debugDrawWorld(); - - - renderme(); - - glFlush(); - glutSwapBuffers(); -} - - - - - -void MultiThreadedDemo::initPhysics() -{ -#ifdef USE_PARALLEL_DISPATCHER - m_threadSupportSolver = 0; - m_threadSupportCollision = 0; -#endif - -//#define USE_GROUND_PLANE 1 -#ifdef USE_GROUND_PLANE - m_collisionShapes.push_back(new btStaticPlaneShape(btVector3(0,1,0),0.5)); -#else - - ///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 - m_collisionShapes.push_back(new btBoxShape (btVector3(200,CUBE_HALF_EXTENTS,200))); -#endif - - m_collisionShapes.push_back(new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS))); - - - - setCameraDistance(32.5f); - - m_azi = 90.f; - - m_dispatcher=0; - m_collisionConfiguration = new btDefaultCollisionConfiguration(); - -#ifdef USE_PARALLEL_DISPATCHER - int maxNumOutstandingTasks = 4; - -#ifdef USE_WIN32_THREADING - -m_threadSupportCollision = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo( - "collision", - processCollisionTask, - createCollisionLocalStoreMemory, - maxNumOutstandingTasks)); -#else - -#ifdef USE_LIBSPE2 - - spe_program_handle_t * program_handle; -#ifndef USE_CESOF - program_handle = spe_image_open ("./spuCollision.elf"); - if (program_handle == NULL) - { - perror( "SPU OPEN IMAGE ERROR\n"); - } - else - { - printf( "IMAGE OPENED\n"); - } -#else - extern spe_program_handle_t spu_program; - program_handle = &spu_program; -#endif - SpuLibspe2Support* threadSupportCollision = new SpuLibspe2Support( program_handle, maxNumOutstandingTasks); -#elif defined (USE_PTHREADS) - PosixThreadSupport::ThreadConstructionInfo constructionInfo("collision", - processCollisionTask, - createCollisionLocalStoreMemory, - maxNumOutstandingTasks); - m_threadSupportCollision = new PosixThreadSupport(constructionInfo); -#else - - SequentialThreadSupport::SequentialThreadConstructionInfo colCI("collision",processCollisionTask,createCollisionLocalStoreMemory); - SequentialThreadSupport* m_threadSupportCollision = new SequentialThreadSupport(colCI); - -#endif //USE_LIBSPE2 - -///Playstation 3 SPU (SPURS) version is available through PS3 Devnet -/// 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 -#endif - - - m_dispatcher = new SpuGatheringCollisionDispatcher(m_threadSupportCollision,maxNumOutstandingTasks,m_collisionConfiguration); -// m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration); -#else - - m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration); -#endif //USE_PARALLEL_DISPATCHER - - - btVector3 worldAabbMin(-1000,-1000,-1000); - btVector3 worldAabbMax(1000,1000,1000); - - m_broadphase = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies); - - - -#ifdef USE_PARALLEL_SOLVER - -#ifdef USE_WIN32_THREADING - m_threadSupportSolver = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo( - "solver", - processSolverTask, - createSolverLocalStoreMemory, - maxNumOutstandingTasks)); -#elif defined (USE_PTHREADS) - PosixThreadSupport::ThreadConstructionInfo solverConstructionInfo("solver", processSolverTask, - createSolverLocalStoreMemory, maxNumOutstandingTasks); - - m_threadSupportSolver = new PosixThreadSupport(solverConstructionInfo); -#else - //for now use sequential version - SequentialThreadSupport::SequentialThreadConstructionInfo solverCI("solver",processSolverTask,createSolverLocalStoreMemory); - m_threadSupportSolver = new SequentialThreadSupport(solverCI); - -#endif //USE_WIN32_THREADING - m_solver = new btParallelSequentialImpulseSolver(m_threadSupportSolver,maxNumOutstandingTasks); - -#else - - btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver(); - - m_solver = solver; - //default solverMode is SOLVER_RANDMIZE_ORDER. Warmstarting seems not to improve convergence, see - //solver->setSolverMode(0);//btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER); - -#endif //USE_PARALLEL_SOLVER - - btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration); - m_dynamicsWorld = world; - - world->getSolverInfo().m_numIterations = 4; - - m_dynamicsWorld->getDispatchInfo().m_enableSPU = true; - m_dynamicsWorld->setGravity(btVector3(0,-10,0)); - - - - int i; - - btTransform tr; - tr.setIdentity(); - - - for (i=0;i0) - { - shapeIndex[i] = 1;//sphere - } - else - shapeIndex[i] = 0; - } - - - btTransform trans; - trans.setIdentity(); - - btScalar halfExtents = CUBE_HALF_EXTENTS; - - trans.setOrigin(btVector3(0,-halfExtents,0)); - - - - localCreateRigidBody(0.f,trans,m_collisionShapes[shapeIndex[0]]); - - int numWalls = 15; - int wallHeight = 15; - float wallDistance = 3; - - - for ( i=0;isetLinearVelocity(btVector3(0,0,-10)); -#endif -// clientResetScene(); - - -} - - - - - - -void MultiThreadedDemo::exitPhysics() -{ - - //cleanup in the reverse order of creation/initialization - - //remove the rigidbodies from the dynamics world and delete them - int i; - for (i=m_dynamicsWorld->getNumCollisionObjects()-1; i>=0 ;i--) - { - btCollisionObject* obj = m_dynamicsWorld->getCollisionObjectArray()[i]; - btRigidBody* body = btRigidBody::upcast(obj); - if (body && body->getMotionState()) - { - delete body->getMotionState(); - } - m_dynamicsWorld->removeCollisionObject( obj ); - delete obj; - } - - //delete collision shapes - for (int j=0;jsetSolverMode(0);//btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER); + +#endif //USE_PARALLEL_SOLVER + + btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration); + m_dynamicsWorld = world; + + world->getSolverInfo().m_numIterations = 4; + + m_dynamicsWorld->getDispatchInfo().m_enableSPU = true; + m_dynamicsWorld->setGravity(btVector3(0,-10,0)); + + + + int i; + + btTransform tr; + tr.setIdentity(); + + + for (i=0;i0) + { + shapeIndex[i] = 1;//sphere + } + else + shapeIndex[i] = 0; + } + + + btTransform trans; + trans.setIdentity(); + + btScalar halfExtents = CUBE_HALF_EXTENTS; + + trans.setOrigin(btVector3(0,-halfExtents,0)); + + + + localCreateRigidBody(0.f,trans,m_collisionShapes[shapeIndex[0]]); + + int numWalls = 15; + int wallHeight = 15; + float wallDistance = 3; + + + for ( i=0;isetLinearVelocity(btVector3(0,0,-10)); +#endif +// clientResetScene(); + + +} + + + + + + +void MultiThreadedDemo::exitPhysics() +{ + + //cleanup in the reverse order of creation/initialization + + //remove the rigidbodies from the dynamics world and delete them + int i; + for (i=m_dynamicsWorld->getNumCollisionObjects()-1; i>=0 ;i--) + { + btCollisionObject* obj = m_dynamicsWorld->getCollisionObjectArray()[i]; + btRigidBody* body = btRigidBody::upcast(obj); + if (body && body->getMotionState()) + { + delete body->getMotionState(); + } + m_dynamicsWorld->removeCollisionObject( obj ); + delete obj; + } + + //delete collision shapes + for (int j=0;j -# 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 diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index f44d0cb39..b1c916ada 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/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 diff --git a/msvc/6/libbulletmultithreaded.dsp b/msvc/6/libbulletmultithreaded.dsp index 859244691..9b0802870 100644 --- a/msvc/6/libbulletmultithreaded.dsp +++ b/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 diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 47b0f3de1..9692f0bb0 100644 --- a/msvc/6/wksbullet.dsw +++ b/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> diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index 1a994d74f..e3f54caac 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/7/appEPAPenDepthDemo.vcproj b/msvc/7/appEPAPenDepthDemo.vcproj index 7d14ddf12..0af77441b 100644 --- a/msvc/7/appEPAPenDepthDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/7/appGimpactTestDemo.vcproj b/msvc/7/appGimpactTestDemo.vcproj index 8d9420915..47470e5e3 100644 --- a/msvc/7/appGimpactTestDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/7/appMovingConcaveDemo.vcproj b/msvc/7/appMovingConcaveDemo.vcproj index 6690010f0..7eb5d2814 100644 --- a/msvc/7/appMovingConcaveDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/7/libGIMPACT.vcproj b/msvc/7/libGIMPACT.vcproj deleted file mode 100644 index 84429cd9b..000000000 --- a/msvc/7/libGIMPACT.vcproj +++ /dev/null @@ -1,459 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index 823a7da68..d8d0fc0de 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -602,6 +602,39 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -846,6 +879,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/libbulletmultithreaded.vcproj b/msvc/7/libbulletmultithreaded.vcproj index bbd3bcb3d..02bcc890e 100644 --- a/msvc/7/libbulletmultithreaded.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -420,113 +420,113 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h"> diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 83d05d5db..c1ff39245 100644 --- a/msvc/7/wksbullet.sln +++ b/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}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {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}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {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}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {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}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} 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 diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index 21aeef46e..7d9961ce0 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/71/appEPAPenDepthDemo.vcproj b/msvc/71/appEPAPenDepthDemo.vcproj index 5a746444e..8336f0ea0 100644 --- a/msvc/71/appEPAPenDepthDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/71/appGimpactTestDemo.vcproj b/msvc/71/appGimpactTestDemo.vcproj index 3655929b8..cfb2cdbfa 100644 --- a/msvc/71/appGimpactTestDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/71/appMovingConcaveDemo.vcproj b/msvc/71/appMovingConcaveDemo.vcproj index 36d1c4a7d..38d0b40d1 100644 --- a/msvc/71/appMovingConcaveDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/71/libGIMPACT.vcproj b/msvc/71/libGIMPACT.vcproj deleted file mode 100644 index e32094c28..000000000 --- a/msvc/71/libGIMPACT.vcproj +++ /dev/null @@ -1,459 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index 5726c4213..0b103f36a 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -602,6 +602,39 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -846,6 +879,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/libbulletmultithreaded.vcproj b/msvc/71/libbulletmultithreaded.vcproj index a8f292c54..c1c4a56a0 100644 --- a/msvc/71/libbulletmultithreaded.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -420,113 +420,113 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h"> diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 56fbb3e93..394002fd4 100644 --- a/msvc/71/wksbullet.sln +++ b/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}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {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}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {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}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {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}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} 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 diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index b2ef9ad30..9b871ee09 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/8/appEPAPenDepthDemo.vcproj b/msvc/8/appEPAPenDepthDemo.vcproj index 00795e372..a1872636d 100644 --- a/msvc/8/appEPAPenDepthDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/8/appGimpactTestDemo.vcproj b/msvc/8/appGimpactTestDemo.vcproj index 8cf01e620..b602a9ae0 100644 --- a/msvc/8/appGimpactTestDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/8/appMovingConcaveDemo.vcproj b/msvc/8/appMovingConcaveDemo.vcproj index 46868c5eb..27707f300 100644 --- a/msvc/8/appMovingConcaveDemo.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ diff --git a/msvc/8/libGIMPACT.vcproj b/msvc/8/libGIMPACT.vcproj deleted file mode 100644 index 87be6d852..000000000 --- a/msvc/8/libGIMPACT.vcproj +++ /dev/null @@ -1,459 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index 5b5263f68..999427851 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -602,6 +602,39 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -846,6 +879,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/libbulletmultithreaded.vcproj b/msvc/8/libbulletmultithreaded.vcproj index ea1a24f22..7a16c2614 100644 --- a/msvc/8/libbulletmultithreaded.vcproj +++ b/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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -420,113 +420,113 @@ Name="Source Files" Filter=""> + RelativePath="..\..\src\BulletMultiThreaded\btThreadSupportInterface.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\PosixThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SequentialThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuBatchRaycaster.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuCollisionTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuFakeDma.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuParallelSolver.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuRaycastTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSampleTaskProcess.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuConvexPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuEpaPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkEpa2.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGjkPairDetector.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuLocalSupport.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuPreferredPenetrationDirections.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuVoronoiSimplexSolver.h"> + RelativePath="..\..\src\BulletMultiThreaded\SpuSolverTask\SpuParallellSolverTask.h"> diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index e84ae9db0..dd3b2aa04 100644 --- a/msvc/8/wksbullet.sln +++ b/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}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {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}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {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}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {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}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} 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 diff --git a/src/BulletCollision/Gimpact/btGImpactShape.h b/src/BulletCollision/Gimpact/btGImpactShape.h index 43f32bea5..ebdbb4fa6 100644 --- a/src/BulletCollision/Gimpact/btGImpactShape.h +++ b/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); diff --git a/src/BulletMultiThreaded/Win32ThreadSupport.h b/src/BulletMultiThreaded/Win32ThreadSupport.h index b82d94868..951c8a2e4 100644 --- a/src/BulletMultiThreaded/Win32ThreadSupport.h +++ b/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