From 725d69c0c505307d0cf6fb391a1458b7e14748aa Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Fri, 6 Oct 2006 06:00:29 +0000 Subject: [PATCH] more refactoring/cleanup --- msvc/6/grpapps_bullet.dsp | 8 ++++---- msvc/6/libbulletcollision.dsp | 8 -------- msvc/6/libbulletdynamics.dsp | 4 ---- msvc/6/wksbullet.dsw | 18 ---------------- msvc/7/grpapps_bullet.vcproj | 8 ++++---- msvc/7/libbulletcollision.vcproj | 6 ------ msvc/7/libbulletdynamics.vcproj | 3 --- msvc/7/wksbullet.sln | 34 ++++++++++++------------------- msvc/71/grpapps_bullet.vcproj | 8 ++++---- msvc/71/libbulletcollision.vcproj | 6 ------ msvc/71/libbulletdynamics.vcproj | 3 --- msvc/71/wksbullet.sln | 34 ++++++++++++------------------- msvc/8/grpapps_bullet.vcproj | 8 ++++---- msvc/8/libbulletcollision.vcproj | 6 ------ msvc/8/libbulletdynamics.vcproj | 3 --- msvc/8/wksbullet.sln | 34 ++++++++++++------------------- 16 files changed, 55 insertions(+), 136 deletions(-) diff --git a/msvc/6/grpapps_bullet.dsp b/msvc/6/grpapps_bullet.dsp index 0f5557a1b..a40a69feb 100644 --- a/msvc/6/grpapps_bullet.dsp +++ b/msvc/6/grpapps_bullet.dsp @@ -43,11 +43,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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "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\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.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\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c -# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.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\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index 946312728..04237e8c4 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/msvc/6/libbulletcollision.dsp @@ -284,10 +284,6 @@ SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp # End Source File # Begin Source File -SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldContactAddResult.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp # End Source File # Begin Source File @@ -516,10 +512,6 @@ SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.h # End Source File # Begin Source File -SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldContactAddResult.h -# End Source File -# Begin Source File - SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btManifoldPoint.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp index 02586da9f..9bc36c6a0 100644 --- a/msvc/6/libbulletdynamics.dsp +++ b/msvc/6/libbulletdynamics.dsp @@ -204,10 +204,6 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\btDynamicsWorld.h # End Source File # Begin Source File -SOURCE=..\..\src\BulletDynamics\Dynamics\btMassProps.h -# End Source File -# Begin Source File - SOURCE=..\..\src\BulletDynamics\Dynamics\btRigidBody.h # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 9d69f9ff7..6cde0b725 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -270,18 +270,6 @@ Package=<4> ############################################################################### -Project: "appGPUphysics"=.\appGPUphysics.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "appRaytracer"=.\appRaytracer.dsp - Package Owner=<4> Package=<5> @@ -393,9 +381,6 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appGPUphysics - End Project Dependency - Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency @@ -468,9 +453,6 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appGPUphysics - End Project Dependency - Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency diff --git a/msvc/7/grpapps_bullet.vcproj b/msvc/7/grpapps_bullet.vcproj index 23786ec86..ebb69a789 100644 --- a/msvc/7/grpapps_bullet.vcproj +++ b/msvc/7/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release7\build\grpapps_bullet\" ObjectFile="..\..\out\release7\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug7\build\grpapps_bullet\" ObjectFile="..\..\out\debug7\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index 4f60dc9db..89346aa8c 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -296,9 +296,6 @@ - - @@ -471,9 +468,6 @@ - - diff --git a/msvc/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj index 345f8ed62..0b0592a8a 100644 --- a/msvc/7/libbulletdynamics.vcproj +++ b/msvc/7/libbulletdynamics.vcproj @@ -237,9 +237,6 @@ - - diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 08f643373..fb102a712 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -125,17 +123,16 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -146,10 +143,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -199,10 +195,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/71/grpapps_bullet.vcproj b/msvc/71/grpapps_bullet.vcproj index 5c7478eec..1c7284d00 100644 --- a/msvc/71/grpapps_bullet.vcproj +++ b/msvc/71/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release71\build\grpapps_bullet\" ObjectFile="..\..\out\release71\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug71\build\grpapps_bullet\" ObjectFile="..\..\out\debug71\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index c454e5726..094971376 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -296,9 +296,6 @@ - - @@ -471,9 +468,6 @@ - - diff --git a/msvc/71/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj index df9061690..4ee764b1b 100644 --- a/msvc/71/libbulletdynamics.vcproj +++ b/msvc/71/libbulletdynamics.vcproj @@ -237,9 +237,6 @@ - - diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 3b099e11e..2b0080d63 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -125,17 +123,16 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -146,10 +143,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -199,10 +195,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/8/grpapps_bullet.vcproj b/msvc/8/grpapps_bullet.vcproj index 30edddbfc..f7c192f45 100644 --- a/msvc/8/grpapps_bullet.vcproj +++ b/msvc/8/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\" ObjectFile="..\..\out\release8\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\" ObjectFile="..\..\out\debug8\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index d81edb473..8093d4c6d 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -296,9 +296,6 @@ - - @@ -471,9 +468,6 @@ - - diff --git a/msvc/8/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj index 7f7d3fe6e..17d95b8a0 100644 --- a/msvc/8/libbulletdynamics.vcproj +++ b/msvc/8/libbulletdynamics.vcproj @@ -237,9 +237,6 @@ - - diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index e4037c95d..74d12948d 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -125,17 +123,16 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} @@ -146,10 +143,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -199,10 +195,6 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32