diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp index 35e34d752..66a9048e2 100644 --- a/msvc/6/appAllBulletDemos.dsp +++ b/msvc/6/appAllBulletDemos.dsp @@ -222,18 +222,6 @@ SOURCE=..\..\Demos\AllBulletDemos\..\Raytracer\Raytracer.cpp # End Source File # Begin Source File -SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\btSoftBodyRigidBodyCollisionConfiguration.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\btSoftRigidCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\btSoftSoftCollisionAlgorithm.cpp -# End Source File -# Begin Source File - SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\SoftDemo.cpp # End Source File # Begin Source File diff --git a/msvc/6/appMultiThreadedDemo.dsp b/msvc/6/appMultiThreadedDemo.dsp index a5315ff5f..3713a4e08 100644 --- a/msvc/6/appMultiThreadedDemo.dsp +++ b/msvc/6/appMultiThreadedDemo.dsp @@ -45,11 +45,11 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\BulletColladaConverter" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\BulletMultiThreaded" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,11 +73,11 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appMultiThreadedDemo\" # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\BulletColladaConverter" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\BulletMultiThreaded" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -102,11 +102,11 @@ LINK32=link.exe # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\BulletColladaConverter" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\BulletMultiThreaded" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -130,11 +130,11 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appMultiThreadedDemo\" # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Extras\ConvexHull" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\BulletColladaConverter" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\BulletMultiThreaded" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Extras\ConvexHull" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\BulletColladaConverter" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\BulletMultiThreaded" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libEPA.dsp b/msvc/6/libEPA.dsp deleted file mode 100644 index 0745dc4d6..000000000 --- a/msvc/6/libEPA.dsp +++ /dev/null @@ -1,155 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libEPA" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libEPA - 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 "libEPA.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 "libEPA.mak" CFG="libEPA - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libEPA - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "libEPA - 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)" == "libEPA - 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\libEPA\" -# PROP Intermediate_Dir "..\..\out\release6\build\libEPA\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\EPA" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libEPA\libEPA.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\EPA" -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\libEPA.lib" -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 -# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows -# Begin Special Build Tool -SOURCE="$(InputPath)" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libEPA - 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\libEPA\" -# PROP Intermediate_Dir "..\..\out\debug6\build\libEPA\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\EPA" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libEPA\libEPA.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\EPA" -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\libEPA_d.lib" -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 -# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows -# Begin Special Build Tool -SOURCE="$(InputPath)" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libEPA - Win32 Release" -# Name "libEPA - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Extras\EPA\Epa.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaFace.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaPenetrationDepthSolver.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaPolyhedron.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Extras\EPA\Epa.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaCommon.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaFace.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaHalfEdge.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaPenetrationDepthSolver.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaPolyhedron.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\EPA\EpaVertex.h -# End Source File -# End Group -# End Target -# End Project diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index 56fceeb8e..2fe212476 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/msvc/6/libbulletcollision.dsp @@ -332,6 +332,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btShapeHull.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btSphereShape.cpp # End Source File # Begin Source File @@ -616,6 +620,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btShapeHull.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btSphereShape.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp index aa1db6686..d214e00c6 100644 --- a/msvc/6/libbulletdynamics.dsp +++ b/msvc/6/libbulletdynamics.dsp @@ -236,6 +236,10 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletDynamics\SoftBody\btDbvt.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBody.cpp # End Source File # Begin Source File @@ -244,6 +248,22 @@ SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftRigidCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftRigidDynamicsWorld.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftSoftCollisionAlgorithm.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp # End Source File # Begin Source File @@ -360,6 +380,10 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletDynamics\SoftBody\btDbvt.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBody.h # End Source File # Begin Source File @@ -368,6 +392,22 @@ SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBodyHelpers.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftBodyRigidBodyCollisionConfiguration.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftRigidCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftRigidDynamicsWorld.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletDynamics\SoftBody\btSoftSoftCollisionAlgorithm.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletDynamics\SoftBody\btSparseSDF.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp index 8fb54cf34..1e9a222ec 100644 --- a/msvc/6/libbulletmath.dsp +++ b/msvc/6/libbulletmath.dsp @@ -164,6 +164,10 @@ SOURCE=..\..\src\LinearMath\btAlignedAllocator.cpp # End Source File # Begin Source File +SOURCE=..\..\src\LinearMath\btConvexHull.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\LinearMath\btGeometryUtil.cpp # End Source File # Begin Source File @@ -188,6 +192,10 @@ SOURCE=..\..\src\LinearMath\btAlignedObjectArray.h # End Source File # Begin Source File +SOURCE=..\..\src\LinearMath\btConvexHull.h +# End Source File +# Begin Source File + SOURCE=..\..\src\LinearMath\btDefaultMotionState.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletopenglsupport.dsp b/msvc/6/libbulletopenglsupport.dsp index 1d5e8ce90..f98ae6c17 100644 --- a/msvc/6/libbulletopenglsupport.dsp +++ b/msvc/6/libbulletopenglsupport.dsp @@ -45,11 +45,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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexHull" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexHull" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -74,11 +74,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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexHull" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexHull" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -103,11 +103,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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexHull" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexHull" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -132,11 +132,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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexHull" /I "..\..\Glut" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexHull" /i "..\..\Glut" +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libconvexhull.dsp b/msvc/6/libconvexhull.dsp deleted file mode 100644 index ddf4e3e4a..000000000 --- a/msvc/6/libconvexhull.dsp +++ /dev/null @@ -1,183 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libconvexhull" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libconvexhull - 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 "libconvexhull.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 "libconvexhull.mak" CFG="libconvexhull - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libconvexhull - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library") -!MESSAGE "libconvexhull - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "libconvexhull - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library") -!MESSAGE "libconvexhull - 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)" == "libconvexhull - 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\libconvexhull\" -# PROP Intermediate_Dir "..\..\out\release6\build\libconvexhull\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libconvexhull\libconvexhull.res" /i "." /i "..\.." /i "..\..\src" -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\libconvexhull.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)" == "libconvexhull - 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\libconvexhull\" -# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libconvexhull\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libconvexhull\libconvexhull.res" /i "." /i "..\.." /i "..\..\src" -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)" == "libconvexhull - 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\libconvexhull\" -# PROP Intermediate_Dir "..\..\out\debug6\build\libconvexhull\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libconvexhull\libconvexhull.res" /i "." /i "..\.." /i "..\..\src" -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\libconvexhull_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)" == "libconvexhull - 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\libconvexhull\" -# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libconvexhull\" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" -# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libconvexhull\libconvexhull.res" /i "." /i "..\.." /i "..\..\src" -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 "libconvexhull - Win32 Release" -# Name "libconvexhull - Win32 ReleaseDoublePrecision" -# Name "libconvexhull - Win32 Debug" -# Name "libconvexhull - Win32 DebugDoublePrecision" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Extras\ConvexHull\btConvexHull.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\ConvexHull\btShapeHull.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Extras\ConvexHull\btConvexHull.h -# End Source File -# Begin Source File - -SOURCE=..\..\Extras\ConvexHull\btShapeHull.h -# End Source File -# End Group -# End Target -# End Project diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index c8bf4b9d8..f41dcb089 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -21,18 +21,12 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletmultithreaded - End Project Dependency - Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency Begin Project Dependency @@ -65,9 +59,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -92,9 +83,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -119,9 +107,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -146,9 +131,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -173,9 +155,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -200,9 +179,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -234,9 +210,6 @@ Package=<4> Project_Dep_Name libcolladadom End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name liblibxml End Project Dependency }}} @@ -263,9 +236,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -290,9 +260,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -317,9 +284,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -344,9 +308,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -371,9 +332,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -401,9 +359,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libconvexdecomposition End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -428,9 +383,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -456,9 +408,6 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency }}} @@ -485,9 +434,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -516,9 +462,6 @@ Package=<4> Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency Begin Project Dependency @@ -548,9 +491,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -597,9 +537,6 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency }}} @@ -629,21 +566,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexdecomposition - End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - 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 - Project_Dep_Name libglui - End Project Dependency }}} ############################################################################### @@ -668,9 +590,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -695,9 +614,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -722,9 +638,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -749,9 +662,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -776,9 +686,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -803,9 +710,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -830,9 +734,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency - Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency }}} ############################################################################### @@ -957,9 +858,6 @@ Package=<4> Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency Begin Project Dependency @@ -1107,9 +1005,6 @@ Package=<4> Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency - Project_Dep_Name libconvexhull - End Project Dependency - Begin Project Dependency Project_Dep_Name libGIMPACT End Project Dependency Begin Project Dependency @@ -1221,18 +1116,6 @@ Package=<4> ############################################################################### -Project: "libconvexhull"=.\libconvexhull.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libGIMPACT"=.\libGIMPACT.dsp - Package Owner=<4> Package=<5> diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index 21d718dbc..481007687 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/msvc/7/appAllBulletDemos.vcproj @@ -345,15 +345,6 @@ - - - - - - diff --git a/msvc/7/appMultiThreadedDemo.vcproj b/msvc/7/appMultiThreadedDemo.vcproj index 33939b1bf..314a38fd6 100644 --- a/msvc/7/appMultiThreadedDemo.vcproj +++ b/msvc/7/appMultiThreadedDemo.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;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release7\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release7\build\appMultiThreadedDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release_dbl7\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release_dbl7\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release_dbl7\build\appMultiThreadedDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug7\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug7\build\appMultiThreadedDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl7\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug_dbl7\build\appMultiThreadedDemo\" @@ -285,7 +285,7 @@ diff --git a/msvc/7/libEPA.vcproj b/msvc/7/libEPA.vcproj deleted file mode 100644 index ff31cc556..000000000 --- a/msvc/7/libEPA.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index 562947e8f..5bb892b3f 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -415,6 +415,9 @@ + + @@ -629,6 +632,9 @@ + + diff --git a/msvc/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj index 19b99fe6b..6cdf746f7 100644 --- a/msvc/7/libbulletdynamics.vcproj +++ b/msvc/7/libbulletdynamics.vcproj @@ -343,12 +343,27 @@ + + + + + + + + + + @@ -437,12 +452,27 @@ + + + + + + + + + + diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj index a54dd7089..dfa9e5ae4 100644 --- a/msvc/7/libbulletmath.vcproj +++ b/msvc/7/libbulletmath.vcproj @@ -289,6 +289,9 @@ + + @@ -308,6 +311,9 @@ + + diff --git a/msvc/7/libbulletopenglsupport.vcproj b/msvc/7/libbulletopenglsupport.vcproj index e25bc2ece..75c1151e5 100644 --- a/msvc/7/libbulletopenglsupport.vcproj +++ b/msvc/7/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release7\build\libbulletopenglsupport\" ObjectFile="..\..\out\release7\build\libbulletopenglsupport\" @@ -77,7 +77,7 @@ @@ -97,7 +97,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release_dbl7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release_dbl7\build\libbulletopenglsupport\" ObjectFile="..\..\out\release_dbl7\build\libbulletopenglsupport\" @@ -138,7 +138,7 @@ @@ -163,7 +163,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug7\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug7\build\libbulletopenglsupport\" @@ -208,7 +208,7 @@ @@ -233,7 +233,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug_dbl7\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug_dbl7\build\libbulletopenglsupport\" @@ -274,7 +274,7 @@ diff --git a/msvc/7/libconvexhull.vcproj b/msvc/7/libconvexhull.vcproj deleted file mode 100644 index 483892268..000000000 --- a/msvc/7/libconvexhull.vcproj +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 783196d10..ad83c008a 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -80,8 +80,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}") = "libconvexhull", "libconvexhull.vcproj", "{F6CD8342-32FB-4428-13F9-9BE726E1709F}" -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}" @@ -101,111 +99,91 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {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} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -213,53 +191,40 @@ 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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {330B5049-6935-5CE6-79B7-28F570962895}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -297,11 +262,10 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.34 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.35 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.36 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {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} @@ -339,11 +303,10 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {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}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -666,14 +629,6 @@ Global {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.ActiveCfg = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.Build.0 = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.ActiveCfg = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.Build.0 = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.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}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index ebe82fa15..1b5f784b4 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/msvc/71/appAllBulletDemos.vcproj @@ -345,15 +345,6 @@ - - - - - - diff --git a/msvc/71/appMultiThreadedDemo.vcproj b/msvc/71/appMultiThreadedDemo.vcproj index 5b5b9dbf8..962bf5b8b 100644 --- a/msvc/71/appMultiThreadedDemo.vcproj +++ b/msvc/71/appMultiThreadedDemo.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;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release71\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release71\build\appMultiThreadedDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release_dbl71\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release_dbl71\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release_dbl71\build\appMultiThreadedDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug71\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug71\build\appMultiThreadedDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl71\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug_dbl71\build\appMultiThreadedDemo\" @@ -285,7 +285,7 @@ diff --git a/msvc/71/libEPA.vcproj b/msvc/71/libEPA.vcproj deleted file mode 100644 index bcc8eef63..000000000 --- a/msvc/71/libEPA.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/71/libExtraSolid35.vcproj b/msvc/71/libExtraSolid35.vcproj deleted file mode 100644 index 833d00226..000000000 --- a/msvc/71/libExtraSolid35.vcproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index 99b155ea1..a5ba1461c 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -415,6 +415,9 @@ + + @@ -629,6 +632,9 @@ + + diff --git a/msvc/71/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj index 1b6dd9306..07873cb66 100644 --- a/msvc/71/libbulletdynamics.vcproj +++ b/msvc/71/libbulletdynamics.vcproj @@ -343,12 +343,27 @@ + + + + + + + + + + @@ -437,12 +452,27 @@ + + + + + + + + + + diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj index 4ca5b72ae..891eefe2c 100644 --- a/msvc/71/libbulletmath.vcproj +++ b/msvc/71/libbulletmath.vcproj @@ -289,6 +289,9 @@ + + @@ -308,6 +311,9 @@ + + diff --git a/msvc/71/libbulletopenglsupport.vcproj b/msvc/71/libbulletopenglsupport.vcproj index c149c3aab..afaa5d483 100644 --- a/msvc/71/libbulletopenglsupport.vcproj +++ b/msvc/71/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release71\build\libbulletopenglsupport\" ObjectFile="..\..\out\release71\build\libbulletopenglsupport\" @@ -77,7 +77,7 @@ @@ -97,7 +97,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release_dbl71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release_dbl71\build\libbulletopenglsupport\" ObjectFile="..\..\out\release_dbl71\build\libbulletopenglsupport\" @@ -138,7 +138,7 @@ @@ -163,7 +163,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug71\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug71\build\libbulletopenglsupport\" @@ -208,7 +208,7 @@ @@ -233,7 +233,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug_dbl71\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug_dbl71\build\libbulletopenglsupport\" @@ -274,7 +274,7 @@ diff --git a/msvc/71/libconvexhull.vcproj b/msvc/71/libconvexhull.vcproj deleted file mode 100644 index f78a2d189..000000000 --- a/msvc/71/libconvexhull.vcproj +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 9221bf3c7..429f0c161 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -80,8 +80,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}") = "libconvexhull", "libconvexhull.vcproj", "{F6CD8342-32FB-4428-13F9-9BE726E1709F}" -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}" @@ -101,111 +99,91 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {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} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -213,53 +191,40 @@ 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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {330B5049-6935-5CE6-79B7-28F570962895}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -297,11 +262,10 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.34 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.35 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.36 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {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} @@ -339,11 +303,10 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {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}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -666,14 +629,6 @@ Global {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.ActiveCfg = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.Build.0 = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.ActiveCfg = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.Build.0 = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.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}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index f6a1429af..a3a988c68 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/msvc/8/appAllBulletDemos.vcproj @@ -345,15 +345,6 @@ - - - - - - diff --git a/msvc/8/appMultiThreadedDemo.vcproj b/msvc/8/appMultiThreadedDemo.vcproj index 9c575050d..590d14a1d 100644 --- a/msvc/8/appMultiThreadedDemo.vcproj +++ b/msvc/8/appMultiThreadedDemo.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;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release8\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release8\build\appMultiThreadedDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\release_dbl8\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\release_dbl8\build\appMultiThreadedDemo\" ObjectFile="..\..\out\release_dbl8\build\appMultiThreadedDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug8\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug8\build\appMultiThreadedDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Extras\ConvexHull;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\BulletColladaConverter;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML;..\..\Extras\LibXML\include;..\..\Extras\BulletMultiThreaded" PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appMultiThreadedDemo\appMultiThreadedDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl8\build\appMultiThreadedDemo\" ObjectFile="..\..\out\debug_dbl8\build\appMultiThreadedDemo\" @@ -285,7 +285,7 @@ diff --git a/msvc/8/libEPA.vcproj b/msvc/8/libEPA.vcproj deleted file mode 100644 index 8341534d5..000000000 --- a/msvc/8/libEPA.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index b70b9c06a..5da020390 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -415,6 +415,9 @@ + + @@ -629,6 +632,9 @@ + + diff --git a/msvc/8/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj index 73277181b..1e34d7b44 100644 --- a/msvc/8/libbulletdynamics.vcproj +++ b/msvc/8/libbulletdynamics.vcproj @@ -343,12 +343,27 @@ + + + + + + + + + + @@ -437,12 +452,27 @@ + + + + + + + + + + diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj index 274e810fe..207d0b690 100644 --- a/msvc/8/libbulletmath.vcproj +++ b/msvc/8/libbulletmath.vcproj @@ -289,6 +289,9 @@ + + @@ -308,6 +311,9 @@ + + diff --git a/msvc/8/libbulletopenglsupport.vcproj b/msvc/8/libbulletopenglsupport.vcproj index ee186a76a..b481b4b10 100644 --- a/msvc/8/libbulletopenglsupport.vcproj +++ b/msvc/8/libbulletopenglsupport.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release8\build\libbulletopenglsupport\" ObjectFile="..\..\out\release8\build\libbulletopenglsupport\" @@ -77,7 +77,7 @@ @@ -97,7 +97,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\release_dbl8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\release_dbl8\build\libbulletopenglsupport\" ObjectFile="..\..\out\release_dbl8\build\libbulletopenglsupport\" @@ -138,7 +138,7 @@ @@ -163,7 +163,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug8\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug8\build\libbulletopenglsupport\" @@ -208,7 +208,7 @@ @@ -233,7 +233,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexHull;..\..\Glut" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut" PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libbulletopenglsupport\libbulletopenglsupport.pch" AssemblerListingLocation="..\..\out\debug_dbl8\build\libbulletopenglsupport\" ObjectFile="..\..\out\debug_dbl8\build\libbulletopenglsupport\" @@ -274,7 +274,7 @@ diff --git a/msvc/8/libconvexhull.vcproj b/msvc/8/libconvexhull.vcproj deleted file mode 100644 index b7c912130..000000000 --- a/msvc/8/libconvexhull.vcproj +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index cf5f8963e..4bfb969a1 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -80,8 +80,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}") = "libconvexhull", "libconvexhull.vcproj", "{F6CD8342-32FB-4428-13F9-9BE726E1709F}" -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}" @@ -101,111 +99,91 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {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} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {3578834A-4B06-DE6F-78AC-FE11F7226D35}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {67034B5D-16DD-DC97-82F6-23B9E6108940}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {67034B5D-16DD-DC97-82F6-23B9E6108940}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {67034B5D-16DD-DC97-82F6-23B9E6108940}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {67034B5D-16DD-DC97-82F6-23B9E6108940}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {67034B5D-16DD-DC97-82F6-23B9E6108940}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7284F809-AF30-6315-88C6-86F1C0798760}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {06166AA4-DDAE-0CA9-6D52-DA45A1965B88}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E2707D44-8B82-55F1-6C5A-D03B19159248}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E2707D44-8B82-55F1-6C5A-D03B19159248}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E2707D44-8B82-55F1-6C5A-D03B19159248}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E2707D44-8B82-55F1-6C5A-D03B19159248}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E2707D44-8B82-55F1-6C5A-D03B19159248}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {33C16464-831E-103A-5F37-65CCD4F9191F}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {12B291F0-1880-AFC5-26E1-26DF78EA6D2E}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -213,53 +191,40 @@ 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 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6D016A7B-39C8-2018-733F-22921BE94AC4}.9 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {330B5049-6935-5CE6-79B7-28F570962895}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -297,11 +262,10 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.34 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.35 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.36 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {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} @@ -339,11 +303,10 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F6CD8342-32FB-4428-13F9-9BE726E1709F} - {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}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -666,14 +629,6 @@ Global {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.ActiveCfg = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Release.Build.0 = Release|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.ActiveCfg = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.Debug.Build.0 = Debug|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {F6CD8342-32FB-4428-13F9-9BE726E1709F}.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}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32