From 0404ba51b338813c3780768b7a83e95d3b90d6fd Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sun, 29 Oct 2006 16:51:49 +0000 Subject: [PATCH] addad BulletDino demo (C instead of C++, will use future Bullet C-API) projectfiles --- msvc/6/appBulletDino.dsp | 119 +++++++++++++++++++ msvc/6/appVehicleDemo.dsp | 8 +- msvc/6/libbulletcollision.dsp | 16 +++ msvc/6/libbulletmath.dsp | 4 + msvc/6/wksbullet.dsw | 69 +++++++++++ msvc/7/appBulletDino.vcproj | 183 ++++++++++++++++++++++++++++++ msvc/7/appVehicleDemo.vcproj | 8 +- msvc/7/libbulletcollision.vcproj | 12 ++ msvc/7/libbulletmath.vcproj | 3 + msvc/7/wksbullet.sln | 93 +++++++++------ msvc/71/appBulletDino.vcproj | 183 ++++++++++++++++++++++++++++++ msvc/71/appVehicleDemo.vcproj | 8 +- msvc/71/libbulletcollision.vcproj | 12 ++ msvc/71/libbulletmath.vcproj | 3 + msvc/71/wksbullet.sln | 93 +++++++++------ msvc/8/appBulletDino.vcproj | 183 ++++++++++++++++++++++++++++++ msvc/8/appVehicleDemo.vcproj | 8 +- msvc/8/libbulletcollision.vcproj | 12 ++ msvc/8/libbulletmath.vcproj | 3 + msvc/8/wksbullet.sln | 93 +++++++++------ 20 files changed, 998 insertions(+), 115 deletions(-) create mode 100644 msvc/6/appBulletDino.dsp create mode 100644 msvc/7/appBulletDino.vcproj create mode 100644 msvc/71/appBulletDino.vcproj create mode 100644 msvc/8/appBulletDino.vcproj diff --git a/msvc/6/appBulletDino.dsp b/msvc/6/appBulletDino.dsp new file mode 100644 index 000000000..3f3f9984b --- /dev/null +++ b/msvc/6/appBulletDino.dsp @@ -0,0 +1,119 @@ +# Microsoft Developer Studio Project File - Name="appBulletDino" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=appBulletDino - 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 "appBulletDino.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 "appBulletDino.mak" CFG="appBulletDino - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "appBulletDino - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "appBulletDino - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "appBulletDino - 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\appBulletDino\" +# PROP Intermediate_Dir "..\..\out\release6\build\appBulletDino\" +# 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 "..\..\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" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# 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\appBulletDino\appBulletDino.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" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +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 glut32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /out:"..\..\BulletDino.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appBulletDino - 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\appBulletDino\" +# PROP Intermediate_Dir "..\..\out\debug6\build\appBulletDino\" +# 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 "..\..\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" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" +# 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\appBulletDino\appBulletDino.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" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" +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 glut32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /out:"..\..\BulletDino.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "appBulletDino - Win32 Release" +# Name "appBulletDino - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\BulletDinoDemo\BulletDino.c +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\msvc\appBulletDino.rc +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/appVehicleDemo.dsp b/msvc/6/appVehicleDemo.dsp index 863e92eb7..58947b1f1 100644 --- a/msvc/6/appVehicleDemo.dsp +++ b/msvc/6/appVehicleDemo.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 "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# 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 "..\..\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" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # 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\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appVehicleDemo\appVehicleDemo.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" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # 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 "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" +# 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 "..\..\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" /I "..\..\Glut" /I "..\..\Demos\OpenGL" # 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\appVehicleDemo\appVehicleDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appVehicleDemo\appVehicleDemo.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" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index 04237e8c4..bef2cac0f 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/msvc/6/libbulletcollision.dsp @@ -172,10 +172,18 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgori # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionDispatch\btUnionFind.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp # End Source File # Begin Source File @@ -384,10 +392,18 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgori # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionDispatch\btUnionFind.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp index e6bad4bd0..425b661e4 100644 --- a/msvc/6/libbulletmath.dsp +++ b/msvc/6/libbulletmath.dsp @@ -116,6 +116,10 @@ SOURCE=..\..\src\LinearMath\btAabbUtil2.h # End Source File # Begin Source File +SOURCE=..\..\src\LinearMath\btDefaultMotionState.h +# End Source File +# Begin Source File + SOURCE=..\..\src\LinearMath\btIDebugDraw.h # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index abef3c8a8..905fd56da 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -60,6 +60,39 @@ Package=<4> ############################################################################### +Project: "appBulletDino"=.\appBulletDino.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libbulletcollision + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletdynamics + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmath + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletopenglsupport + End Project Dependency + Begin Project Dependency + Project_Dep_Name libcolladadom + End Project Dependency + Begin Project Dependency + Project_Dep_Name libconvexdecomposition + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblibxml + End Project Dependency +}}} + +############################################################################### + Project: "appCcdPhysicsDemo"=.\appCcdPhysicsDemo.dsp - Package Owner=<4> Package=<5> @@ -378,6 +411,30 @@ Package=<4> ############################################################################### +Project: "appVehicleDemo"=.\appVehicleDemo.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libbulletcollision + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletdynamics + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmath + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletopenglsupport + End Project Dependency +}}} + +############################################################################### + Project: "grpall_bullet"=.\grpall_bullet.dsp - Package Owner=<4> Package=<5> @@ -393,6 +450,9 @@ Package=<4> Project_Dep_Name appBspDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appBulletDino + End Project Dependency + Begin Project Dependency Project_Dep_Name appCcdPhysicsDemo End Project Dependency Begin Project Dependency @@ -432,6 +492,9 @@ Package=<4> Project_Dep_Name appUserCollisionAlgorithm End Project Dependency Begin Project Dependency + Project_Dep_Name appVehicleDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name libbulletcollision End Project Dependency Begin Project Dependency @@ -471,6 +534,9 @@ Package=<4> Project_Dep_Name appBspDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appBulletDino + End Project Dependency + Begin Project Dependency Project_Dep_Name appCcdPhysicsDemo End Project Dependency Begin Project Dependency @@ -509,6 +575,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name appUserCollisionAlgorithm End Project Dependency + Begin Project Dependency + Project_Dep_Name appVehicleDemo + End Project Dependency }}} ############################################################################### diff --git a/msvc/7/appBulletDino.vcproj b/msvc/7/appBulletDino.vcproj new file mode 100644 index 000000000..c2a979770 --- /dev/null +++ b/msvc/7/appBulletDino.vcproj @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/appVehicleDemo.vcproj b/msvc/7/appVehicleDemo.vcproj index f6a7c598d..8518d608c 100644 --- a/msvc/7/appVehicleDemo.vcproj +++ b/msvc/7/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appVehicleDemo\" ObjectFile="..\..\out\release7\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appVehicleDemo\" ObjectFile="..\..\out\debug7\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index 89346aa8c..74ad4be6a 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -212,9 +212,15 @@ + + + + @@ -372,9 +378,15 @@ + + + + diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj index f1c67ed5b..f3dfa6352 100644 --- a/msvc/7/libbulletmath.vcproj +++ b/msvc/7/libbulletmath.vcproj @@ -171,6 +171,9 @@ + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 2cf2c85f6..d7c8b5fe7 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDem EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}" @@ -30,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}" @@ -67,6 +71,13 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {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 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {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} @@ -121,43 +132,51 @@ Global {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} + {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} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {6210A080-01C0-6D67-F1DB-669393175402}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {6210A080-01C0-6D67-F1DB-669393175402}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {6210A080-01C0-6D67-F1DB-669393175402}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {6210A080-01C0-6D67-F1DB-669393175402}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {6210A080-01C0-6D67-F1DB-669393175402}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {6210A080-01C0-6D67-F1DB-669393175402}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {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} @@ -175,6 +194,10 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.ActiveCfg = Debug|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.Build.0 = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.ActiveCfg = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.Build.0 = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.ActiveCfg = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.Build.0 = Debug|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.ActiveCfg = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32 @@ -227,6 +250,10 @@ Global {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/71/appBulletDino.vcproj b/msvc/71/appBulletDino.vcproj new file mode 100644 index 000000000..e67c4aacd --- /dev/null +++ b/msvc/71/appBulletDino.vcproj @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/appVehicleDemo.vcproj b/msvc/71/appVehicleDemo.vcproj index 34ba67ad5..f94d28241 100644 --- a/msvc/71/appVehicleDemo.vcproj +++ b/msvc/71/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appVehicleDemo\" ObjectFile="..\..\out\release71\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appVehicleDemo\" ObjectFile="..\..\out\debug71\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index 094971376..5d0717825 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -212,9 +212,15 @@ + + + + @@ -372,9 +378,15 @@ + + + + diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj index 58b126069..8ae96a9e1 100644 --- a/msvc/71/libbulletmath.vcproj +++ b/msvc/71/libbulletmath.vcproj @@ -171,6 +171,9 @@ + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 06d760e8f..31e28e2ef 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDem EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}" @@ -30,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}" @@ -67,6 +71,13 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {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 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {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} @@ -121,43 +132,51 @@ Global {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} + {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} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {6210A080-01C0-6D67-F1DB-669393175402}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {6210A080-01C0-6D67-F1DB-669393175402}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {6210A080-01C0-6D67-F1DB-669393175402}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {6210A080-01C0-6D67-F1DB-669393175402}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {6210A080-01C0-6D67-F1DB-669393175402}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {6210A080-01C0-6D67-F1DB-669393175402}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {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} @@ -175,6 +194,10 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.ActiveCfg = Debug|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.Build.0 = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.ActiveCfg = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.Build.0 = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.ActiveCfg = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.Build.0 = Debug|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.ActiveCfg = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32 @@ -227,6 +250,10 @@ Global {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/8/appBulletDino.vcproj b/msvc/8/appBulletDino.vcproj new file mode 100644 index 000000000..e110e6644 --- /dev/null +++ b/msvc/8/appBulletDino.vcproj @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/appVehicleDemo.vcproj b/msvc/8/appVehicleDemo.vcproj index 254631838..6314f9661 100644 --- a/msvc/8/appVehicleDemo.vcproj +++ b/msvc/8/appVehicleDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appVehicleDemo\" ObjectFile="..\..\out\release8\build\appVehicleDemo\" @@ -81,7 +81,7 @@ @@ -107,7 +107,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appVehicleDemo\appVehicleDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appVehicleDemo\" ObjectFile="..\..\out\debug8\build\appVehicleDemo\" @@ -154,7 +154,7 @@ diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index 8093d4c6d..7d945ad03 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -212,9 +212,15 @@ + + + + @@ -372,9 +378,15 @@ + + + + diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj index 134ac1d95..0c1317683 100644 --- a/msvc/8/libbulletmath.vcproj +++ b/msvc/8/libbulletmath.vcproj @@ -171,6 +171,9 @@ + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index b00cdf6ce..ff26a8cef 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -4,6 +4,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBasicDemo", "appBasicDem EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBspDemo", "appBspDemo.vcproj", "{255A379C-F159-5362-4024-D5ADB9F5FBD2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appBulletDino", "appBulletDino.vcproj", "{2707A1D2-F23C-0C78-B99B-AA148865D6DD}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appCcdPhysicsDemo", "appCcdPhysicsDemo.vcproj", "{7284F809-AF30-6315-88C6-86F1C0798760}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appColladaDemo", "appColladaDemo.vcproj", "{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}" @@ -30,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}" @@ -67,6 +71,13 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {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 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {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} @@ -121,43 +132,51 @@ Global {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} + {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} {6210A080-01C0-6D67-F1DB-669393175402}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {6210A080-01C0-6D67-F1DB-669393175402}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {6210A080-01C0-6D67-F1DB-669393175402}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {6210A080-01C0-6D67-F1DB-669393175402}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {6210A080-01C0-6D67-F1DB-669393175402}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {6210A080-01C0-6D67-F1DB-669393175402}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {6210A080-01C0-6D67-F1DB-669393175402}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {6210A080-01C0-6D67-F1DB-669393175402}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {6210A080-01C0-6D67-F1DB-669393175402}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {6210A080-01C0-6D67-F1DB-669393175402}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {6210A080-01C0-6D67-F1DB-669393175402}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {6210A080-01C0-6D67-F1DB-669393175402}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {6210A080-01C0-6D67-F1DB-669393175402}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {6210A080-01C0-6D67-F1DB-669393175402}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} - {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} - {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} - {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} - {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {DAA547D0-0166-C085-0F93-B88CAB800F97} - {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} - {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} - {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} + {9E59B16D-0924-409C-1611-DF2207A0053F}.3 = {7284F809-AF30-6315-88C6-86F1C0798760} + {9E59B16D-0924-409C-1611-DF2207A0053F}.4 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF} + {9E59B16D-0924-409C-1611-DF2207A0053F}.5 = {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {F38629D2-EEB2-1A09-FB82-52B8A8DE759B} + {9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {B94C19C6-F6E7-2F60-56E2-E0BA681B74B3} + {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {DAA547D0-0166-C085-0F93-B88CAB800F97} + {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {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} @@ -175,6 +194,10 @@ Global {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.Build.0 = Release|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.ActiveCfg = Debug|Win32 {255A379C-F159-5362-4024-D5ADB9F5FBD2}.Debug.Build.0 = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.ActiveCfg = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Release.Build.0 = Release|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.ActiveCfg = Debug|Win32 + {2707A1D2-F23C-0C78-B99B-AA148865D6DD}.Debug.Build.0 = Debug|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.ActiveCfg = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Release.Build.0 = Release|Win32 {7284F809-AF30-6315-88C6-86F1C0798760}.Debug.ActiveCfg = Debug|Win32 @@ -227,6 +250,10 @@ Global {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32 + {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32 {6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32