From 912b4ccd2994748815e28589d75ab738e7ea0196 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 11 Apr 2008 21:02:29 +0000 Subject: [PATCH] updated autogenerated projectfiles, added new libbulletsoftbody library. --- msvc/6/appAllBulletDemos.dsp | 4 + msvc/6/appSoftBodyDemo.dsp | 40 +--- msvc/6/libbulletdynamics.dsp | 60 ------ msvc/6/libbulletsoftbody.dsp | 227 ++++++++++++++++++++ msvc/6/wksbullet.dsw | 24 +++ msvc/7/appAllBulletDemos.vcproj | 3 + msvc/7/appSoftBodyDemo.vcproj | 34 +-- msvc/7/libbulletdynamics.vcproj | 45 ---- msvc/7/libbulletsoftbody.vcproj | 342 +++++++++++++++++++++++++++++++ msvc/7/wksbullet.sln | 46 +++-- msvc/71/appAllBulletDemos.vcproj | 3 + msvc/71/appSoftBodyDemo.vcproj | 34 +-- msvc/71/libbulletdynamics.vcproj | 45 ---- msvc/71/libbulletsoftbody.vcproj | 342 +++++++++++++++++++++++++++++++ msvc/71/wksbullet.sln | 46 +++-- msvc/8/appAllBulletDemos.vcproj | 3 + msvc/8/appSoftBodyDemo.vcproj | 34 +-- msvc/8/libbulletdynamics.vcproj | 45 ---- msvc/8/libbulletsoftbody.vcproj | 342 +++++++++++++++++++++++++++++++ msvc/8/wksbullet.sln | 46 +++-- 20 files changed, 1412 insertions(+), 353 deletions(-) create mode 100644 msvc/6/libbulletsoftbody.dsp create mode 100644 msvc/7/libbulletsoftbody.vcproj create mode 100644 msvc/71/libbulletsoftbody.vcproj create mode 100644 msvc/8/libbulletsoftbody.vcproj diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp index 66a9048e2..e000c166b 100644 --- a/msvc/6/appAllBulletDemos.dsp +++ b/msvc/6/appAllBulletDemos.dsp @@ -222,6 +222,10 @@ SOURCE=..\..\Demos\AllBulletDemos\..\Raytracer\Raytracer.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\SliderConstraintDemo\SliderConstraintDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\SoftDemo.cpp # End Source File # Begin Source File diff --git a/msvc/6/appSoftBodyDemo.dsp b/msvc/6/appSoftBodyDemo.dsp index 753bf76cb..2b68f8343 100644 --- a/msvc/6/appSoftBodyDemo.dsp +++ b/msvc/6/appSoftBodyDemo.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 "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull" +# 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" # 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\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,11 +73,11 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appSoftBodyDemo\" # 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 "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull" +# 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" # 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\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull" +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" 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 "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull" +# 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" # 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\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -130,11 +130,11 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appSoftBodyDemo\" # 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 "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull" +# 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" # 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\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull" +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appSoftBodyDemo\appSoftBodyDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -158,18 +158,6 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\Demos\SoftDemo\btSoftBodyRigidBodyCollisionConfiguration.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\SoftDemo\btSoftRigidCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\SoftDemo\btSoftSoftCollisionAlgorithm.cpp -# End Source File -# Begin Source File - SOURCE=..\..\Demos\SoftDemo\main.cpp # End Source File # Begin Source File @@ -182,18 +170,6 @@ SOURCE=..\..\Demos\SoftDemo\SoftDemo.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\Demos\SoftDemo\btSoftBodyRigidBodyCollisionConfiguration.h -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\SoftDemo\btSoftRigidCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Demos\SoftDemo\btSoftSoftCollisionAlgorithm.h -# End Source File -# Begin Source File - SOURCE=..\..\Demos\SoftDemo\SoftDemo.h # End Source File # End Group diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp index d214e00c6..8a30d670b 100644 --- a/msvc/6/libbulletdynamics.dsp +++ b/msvc/6/libbulletdynamics.dsp @@ -236,34 +236,6 @@ 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 - -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 @@ -380,38 +352,6 @@ 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 - -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 - SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h # End Source File # Begin Source File diff --git a/msvc/6/libbulletsoftbody.dsp b/msvc/6/libbulletsoftbody.dsp new file mode 100644 index 000000000..99c1951d0 --- /dev/null +++ b/msvc/6/libbulletsoftbody.dsp @@ -0,0 +1,227 @@ +# Microsoft Developer Studio Project File - Name="libbulletsoftbody" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libbulletsoftbody - 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 "libbulletsoftbody.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 "libbulletsoftbody.mak" CFG="libbulletsoftbody - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libbulletsoftbody - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library") +!MESSAGE "libbulletsoftbody - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libbulletsoftbody - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library") +!MESSAGE "libbulletsoftbody - 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)" == "libbulletsoftbody - 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\libbulletsoftbody\" +# PROP Intermediate_Dir "..\..\out\release6\build\libbulletsoftbody\" +# 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\libbulletsoftbody\libbulletsoftbody.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\libbulletsoftbody.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)" == "libbulletsoftbody - 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\libbulletsoftbody\" +# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libbulletsoftbody\" +# 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\libbulletsoftbody\libbulletsoftbody.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)" == "libbulletsoftbody - 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\libbulletsoftbody\" +# PROP Intermediate_Dir "..\..\out\debug6\build\libbulletsoftbody\" +# 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\libbulletsoftbody\libbulletsoftbody.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\libbulletsoftbody_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)" == "libbulletsoftbody - 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\libbulletsoftbody\" +# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libbulletsoftbody\" +# 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\libbulletsoftbody\libbulletsoftbody.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 "libbulletsoftbody - Win32 Release" +# Name "libbulletsoftbody - Win32 ReleaseDoublePrecision" +# Name "libbulletsoftbody - Win32 Debug" +# Name "libbulletsoftbody - Win32 DebugDoublePrecision" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btDbvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBody.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBodyHelpers.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftRigidDynamicsWorld.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftSoftCollisionAlgorithm.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btDbvt.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBody.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBodyHelpers.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftRigidDynamicsWorld.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSoftSoftCollisionAlgorithm.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\BulletSoftBody\btSparseSDF.h +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index f41dcb089..166f6d514 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -24,6 +24,9 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletsoftbody + End Project Dependency + Begin Project Dependency Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency @@ -686,6 +689,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletsoftbody + End Project Dependency }}} ############################################################################### @@ -852,6 +858,9 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletsoftbody + End Project Dependency + Begin Project Dependency Project_Dep_Name libcolladadom End Project Dependency Begin Project Dependency @@ -999,6 +1008,9 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletsoftbody + End Project Dependency + Begin Project Dependency Project_Dep_Name libcolladadom End Project Dependency Begin Project Dependency @@ -1092,6 +1104,18 @@ Package=<4> ############################################################################### +Project: "libbulletsoftbody"=.\libbulletsoftbody.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libcolladadom"=.\libcolladadom.dsp - Package Owner=<4> Package=<5> diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index 481007687..22d9553f8 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/msvc/7/appAllBulletDemos.vcproj @@ -345,6 +345,9 @@ + + diff --git a/msvc/7/appSoftBodyDemo.vcproj b/msvc/7/appSoftBodyDemo.vcproj index bb75eb9ac..a6fd4ebb2 100644 --- a/msvc/7/appSoftBodyDemo.vcproj +++ b/msvc/7/appSoftBodyDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release7\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release7\build\appSoftBodyDemo\" ObjectFile="..\..\out\release7\build\appSoftBodyDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release_dbl7\build\appSoftBodyDemo\" ObjectFile="..\..\out\release_dbl7\build\appSoftBodyDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug7\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug7\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug7\build\appSoftBodyDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl7\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug_dbl7\build\appSoftBodyDemo\" @@ -285,7 +285,7 @@ @@ -297,15 +297,6 @@ - - - - - - @@ -316,15 +307,6 @@ - - - - - - diff --git a/msvc/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj index 6cdf746f7..8071ad043 100644 --- a/msvc/7/libbulletdynamics.vcproj +++ b/msvc/7/libbulletdynamics.vcproj @@ -343,27 +343,6 @@ - - - - - - - - - - - - - - @@ -452,30 +431,6 @@ - - - - - - - - - - - - - - - - diff --git a/msvc/7/libbulletsoftbody.vcproj b/msvc/7/libbulletsoftbody.vcproj new file mode 100644 index 000000000..1000c2acd --- /dev/null +++ b/msvc/7/libbulletsoftbody.vcproj @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index ad83c008a..5543a7cfc 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -76,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletsoftbody", "libbulletsoftbody.vcproj", "{C04EA8AC-D96C-0E1F-0823-094C1010F087}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" @@ -100,10 +102,11 @@ Global {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 = {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} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {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} @@ -217,6 +220,7 @@ Global {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 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} {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} @@ -260,12 +264,13 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.32 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.33 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {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} {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} @@ -301,12 +306,13 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -613,6 +619,14 @@ Global {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.ActiveCfg = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.Build.0 = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.ActiveCfg = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.Build.0 = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index 1b5f784b4..29d7c5fe3 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/msvc/71/appAllBulletDemos.vcproj @@ -345,6 +345,9 @@ + + diff --git a/msvc/71/appSoftBodyDemo.vcproj b/msvc/71/appSoftBodyDemo.vcproj index f3defc43b..bc15dbd7d 100644 --- a/msvc/71/appSoftBodyDemo.vcproj +++ b/msvc/71/appSoftBodyDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release71\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release71\build\appSoftBodyDemo\" ObjectFile="..\..\out\release71\build\appSoftBodyDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release_dbl71\build\appSoftBodyDemo\" ObjectFile="..\..\out\release_dbl71\build\appSoftBodyDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug71\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug71\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug71\build\appSoftBodyDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl71\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug_dbl71\build\appSoftBodyDemo\" @@ -285,7 +285,7 @@ @@ -297,15 +297,6 @@ - - - - - - @@ -316,15 +307,6 @@ - - - - - - diff --git a/msvc/71/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj index 07873cb66..de19d6042 100644 --- a/msvc/71/libbulletdynamics.vcproj +++ b/msvc/71/libbulletdynamics.vcproj @@ -343,27 +343,6 @@ - - - - - - - - - - - - - - @@ -452,30 +431,6 @@ - - - - - - - - - - - - - - - - diff --git a/msvc/71/libbulletsoftbody.vcproj b/msvc/71/libbulletsoftbody.vcproj new file mode 100644 index 000000000..d234c5455 --- /dev/null +++ b/msvc/71/libbulletsoftbody.vcproj @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 429f0c161..2cf259de2 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -76,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletsoftbody", "libbulletsoftbody.vcproj", "{C04EA8AC-D96C-0E1F-0823-094C1010F087}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" @@ -100,10 +102,11 @@ Global {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 = {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} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {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} @@ -217,6 +220,7 @@ Global {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 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} {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} @@ -260,12 +264,13 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.32 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.33 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {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} {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} @@ -301,12 +306,13 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -613,6 +619,14 @@ Global {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.ActiveCfg = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.Build.0 = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.ActiveCfg = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.Build.0 = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index a3a988c68..5e7116b0f 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/msvc/8/appAllBulletDemos.vcproj @@ -345,6 +345,9 @@ + + diff --git a/msvc/8/appSoftBodyDemo.vcproj b/msvc/8/appSoftBodyDemo.vcproj index ada5ebee9..3307f0bfc 100644 --- a/msvc/8/appSoftBodyDemo.vcproj +++ b/msvc/8/appSoftBodyDemo.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release8\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release8\build\appSoftBodyDemo\" ObjectFile="..\..\out\release8\build\appSoftBodyDemo\" @@ -80,7 +80,7 @@ @@ -101,7 +101,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\release_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\release_dbl8\build\appSoftBodyDemo\" ObjectFile="..\..\out\release_dbl8\build\appSoftBodyDemo\" @@ -144,7 +144,7 @@ @@ -170,7 +170,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug8\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug8\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug8\build\appSoftBodyDemo\" @@ -216,7 +216,7 @@ @@ -242,7 +242,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL" PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appSoftBodyDemo\appSoftBodyDemo.pch" AssemblerListingLocation="..\..\out\debug_dbl8\build\appSoftBodyDemo\" ObjectFile="..\..\out\debug_dbl8\build\appSoftBodyDemo\" @@ -285,7 +285,7 @@ @@ -297,15 +297,6 @@ - - - - - - @@ -316,15 +307,6 @@ - - - - - - diff --git a/msvc/8/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj index 1e34d7b44..d65e13b25 100644 --- a/msvc/8/libbulletdynamics.vcproj +++ b/msvc/8/libbulletdynamics.vcproj @@ -343,27 +343,6 @@ - - - - - - - - - - - - - - @@ -452,30 +431,6 @@ - - - - - - - - - - - - - - - - diff --git a/msvc/8/libbulletsoftbody.vcproj b/msvc/8/libbulletsoftbody.vcproj new file mode 100644 index 000000000..45735e44f --- /dev/null +++ b/msvc/8/libbulletsoftbody.vcproj @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index 4bfb969a1..383befaa1 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -76,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletsoftbody", "libbulletsoftbody.vcproj", "{C04EA8AC-D96C-0E1F-0823-094C1010F087}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" @@ -100,10 +102,11 @@ Global {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 = {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} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {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} @@ -217,6 +220,7 @@ Global {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 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} {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} @@ -260,12 +264,13 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.32 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.33 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {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} {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} @@ -301,12 +306,13 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} {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 = {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} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -613,6 +619,14 @@ Global {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.ActiveCfg = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Release.Build.0 = Release|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.ActiveCfg = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.Debug.Build.0 = Debug|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {C04EA8AC-D96C-0E1F-0823-094C1010F087}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32