diff --git a/msvc/6/appGenericJointDemo.dsp b/msvc/6/appGenericJointDemo.dsp new file mode 100644 index 000000000..7623aa769 --- /dev/null +++ b/msvc/6/appGenericJointDemo.dsp @@ -0,0 +1,201 @@ +# Microsoft Developer Studio Project File - Name="appGenericJointDemo" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=appGenericJointDemo - 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 "appGenericJointDemo.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 "appGenericJointDemo.mak" CFG="appGenericJointDemo - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "appGenericJointDemo - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appGenericJointDemo - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "appGenericJointDemo - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appGenericJointDemo - 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)" == "appGenericJointDemo - 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\appGenericJointDemo\" +# PROP Intermediate_Dir "..\..\out\release6\build\appGenericJointDemo\" +# 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" +# 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\appGenericJointDemo\appGenericJointDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +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:"..\..\GenericJointDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appGenericJointDemo - 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\appGenericJointDemo\" +# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appGenericJointDemo\" +# 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" +# 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\appGenericJointDemo\appGenericJointDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +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 /out:"..\..\GenericJointDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appGenericJointDemo - 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\appGenericJointDemo\" +# PROP Intermediate_Dir "..\..\out\debug6\build\appGenericJointDemo\" +# 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" +# 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\appGenericJointDemo\appGenericJointDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +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:"..\..\GenericJointDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appGenericJointDemo - 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\appGenericJointDemo\" +# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appGenericJointDemo\" +# 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" +# 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\appGenericJointDemo\appGenericJointDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" +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 /out:"..\..\GenericJointDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "appGenericJointDemo - Win32 Release" +# Name "appGenericJointDemo - Win32 ReleaseDoublePrecision" +# Name "appGenericJointDemo - Win32 Debug" +# Name "appGenericJointDemo - Win32 DebugDoublePrecision" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\GenericJointDemo\GenericJointDemo.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Demos\GenericJointDemo\Ragdoll.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\GenericJointDemo\GenericJointDemo.h +# End Source File +# Begin Source File + +SOURCE=..\..\Demos\GenericJointDemo\Ragdoll.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\msvc\appGenericJointDemo.rc +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/libquickstep.dsp b/msvc/6/libquickstep.dsp index 94418f9d4..756355a02 100644 --- a/msvc/6/libquickstep.dsp +++ b/msvc/6/libquickstep.dsp @@ -188,6 +188,10 @@ SOURCE=..\..\Extras\quickstep\OdeSolverBody.cpp # End Source File # Begin Source File +SOURCE=..\..\Extras\quickstep\OdeTypedJoint.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Extras\quickstep\SorLcp.cpp # End Source File # End Group @@ -208,10 +212,18 @@ SOURCE=..\..\Extras\quickstep\OdeJoint.h # End Source File # Begin Source File +SOURCE=..\..\Extras\quickstep\OdeMacros.h +# End Source File +# Begin Source File + SOURCE=..\..\Extras\quickstep\OdeSolverBody.h # End Source File # Begin Source File +SOURCE=..\..\Extras\quickstep\OdeTypedJoint.h +# End Source File +# Begin Source File + SOURCE=..\..\Extras\quickstep\SorLcp.h # End Source File # End Group diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 5b489bede..094467d27 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -327,6 +327,30 @@ Package=<4> ############################################################################### +Project: "appGenericJointDemo"=.\appGenericJointDemo.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: "appGjkConvexCastDemo"=.\appGjkConvexCastDemo.dsp - Package Owner=<4> Package=<5> @@ -546,6 +570,9 @@ Package=<4> Project_Dep_Name appEPAPenDepthDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appGenericJointDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency @@ -579,9 +606,6 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletmultithreaded - End Project Dependency - Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -651,6 +675,9 @@ Package=<4> Project_Dep_Name appEPAPenDepthDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appGenericJointDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency @@ -696,9 +723,6 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletmultithreaded - End Project Dependency - Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -768,18 +792,6 @@ Package=<4> ############################################################################### -Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4> Package=<5> diff --git a/msvc/6/wksbullet_corelib.dsw b/msvc/6/wksbullet_corelib.dsw index a36667998..747f20b6a 100644 --- a/msvc/6/wksbullet_corelib.dsw +++ b/msvc/6/wksbullet_corelib.dsw @@ -39,18 +39,6 @@ Package=<4> ############################################################################### -Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Global: Package=<5> diff --git a/msvc/7/appGenericJointDemo.vcproj b/msvc/7/appGenericJointDemo.vcproj new file mode 100644 index 000000000..29106f753 --- /dev/null +++ b/msvc/7/appGenericJointDemo.vcproj @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/libquickstep.vcproj b/msvc/7/libquickstep.vcproj index 9635ce811..f1f704a03 100644 --- a/msvc/7/libquickstep.vcproj +++ b/msvc/7/libquickstep.vcproj @@ -306,6 +306,9 @@ + + @@ -322,9 +325,15 @@ + + + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index cae12e5c8..33bcfe5e6 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -26,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appDoublePrecisionDemo", "a EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGenericJointDemo", "appGenericJointDemo.vcproj", "{33C16464-831E-103A-5F37-65CCD4F9191F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" @@ -54,8 +56,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -132,6 +132,10 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -174,18 +178,18 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} @@ -205,24 +209,24 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {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 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -329,6 +333,14 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.Build.0 = Debug|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.ActiveCfg = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.Build.0 = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.ActiveCfg = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.Build.0 = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -441,14 +453,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/7/wksbullet_corelib.sln b/msvc/7/wksbullet_corelib.sln index 4a03d7f86..70f6f1ee3 100644 --- a/msvc/7/wksbullet_corelib.sln +++ b/msvc/7/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/71/appGenericJointDemo.vcproj b/msvc/71/appGenericJointDemo.vcproj new file mode 100644 index 000000000..122bbfb6a --- /dev/null +++ b/msvc/71/appGenericJointDemo.vcproj @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/libquickstep.vcproj b/msvc/71/libquickstep.vcproj index 98e47ed13..48994b6a2 100644 --- a/msvc/71/libquickstep.vcproj +++ b/msvc/71/libquickstep.vcproj @@ -306,6 +306,9 @@ + + @@ -322,9 +325,15 @@ + + + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 10cb1ef01..7a99d2420 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -26,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appDoublePrecisionDemo", "a EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGenericJointDemo", "appGenericJointDemo.vcproj", "{33C16464-831E-103A-5F37-65CCD4F9191F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" @@ -54,8 +56,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -132,6 +132,10 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -174,18 +178,18 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} @@ -205,24 +209,24 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {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 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -329,6 +333,14 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.Build.0 = Debug|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.ActiveCfg = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.Build.0 = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.ActiveCfg = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.Build.0 = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -441,14 +453,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/71/wksbullet_corelib.sln b/msvc/71/wksbullet_corelib.sln index b8bbbd2a0..661e5b8ca 100644 --- a/msvc/71/wksbullet_corelib.sln +++ b/msvc/71/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/8/appGenericJointDemo.vcproj b/msvc/8/appGenericJointDemo.vcproj new file mode 100644 index 000000000..a6fb3063b --- /dev/null +++ b/msvc/8/appGenericJointDemo.vcproj @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/libquickstep.vcproj b/msvc/8/libquickstep.vcproj index 33d6692dc..a1113e519 100644 --- a/msvc/8/libquickstep.vcproj +++ b/msvc/8/libquickstep.vcproj @@ -306,6 +306,9 @@ + + @@ -322,9 +325,15 @@ + + + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index 703cd27ea..e9e47b60c 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -26,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appDoublePrecisionDemo", "a EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEPAPenDepthDemo.vcproj", "{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGenericJointDemo", "appGenericJointDemo.vcproj", "{33C16464-831E-103A-5F37-65CCD4F9191F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" @@ -54,8 +56,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -132,6 +132,10 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {33C16464-831E-103A-5F37-65CCD4F9191F}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {33C16464-831E-103A-5F37-65CCD4F9191F}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {33C16464-831E-103A-5F37-65CCD4F9191F}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {33C16464-831E-103A-5F37-65CCD4F9191F}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -174,18 +178,18 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} @@ -205,24 +209,24 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {33C16464-831E-103A-5F37-65CCD4F9191F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {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 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -329,6 +333,14 @@ Global {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.Debug.Build.0 = Debug|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.ActiveCfg = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Release.Build.0 = Release|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.ActiveCfg = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.Debug.Build.0 = Debug|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {33C16464-831E-103A-5F37-65CCD4F9191F}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -441,14 +453,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/8/wksbullet_corelib.sln b/msvc/8/wksbullet_corelib.sln index c0e87643f..ce5d5ba0f 100644 --- a/msvc/8/wksbullet_corelib.sln +++ b/msvc/8/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/appBasicDemo.rc b/msvc/appBasicDemo.rc index c0cf4977c..428ae75c2 100644 --- a/msvc/appBasicDemo.rc +++ b/msvc/appBasicDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BasicDemo" #ifdef CS_DEBUG diff --git a/msvc/appBspDemo.rc b/msvc/appBspDemo.rc index 965571772..d1d793460 100644 --- a/msvc/appBspDemo.rc +++ b/msvc/appBspDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BspDemo" #ifdef CS_DEBUG diff --git a/msvc/appBulletDino.rc b/msvc/appBulletDino.rc index 0e47e48f8..d83c3a196 100644 --- a/msvc/appBulletDino.rc +++ b/msvc/appBulletDino.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BulletDino" #ifdef CS_DEBUG diff --git a/msvc/appCcdPhysicsDemo.rc b/msvc/appCcdPhysicsDemo.rc index a08b921eb..9433b860d 100644 --- a/msvc/appCcdPhysicsDemo.rc +++ b/msvc/appCcdPhysicsDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CcdPhysicsDemo" #ifdef CS_DEBUG diff --git a/msvc/appColladaDemo.rc b/msvc/appColladaDemo.rc index 9cd0d3c7c..4137d2b2f 100644 --- a/msvc/appColladaDemo.rc +++ b/msvc/appColladaDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ColladaDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionDemo.rc b/msvc/appCollisionDemo.rc index bea6cd522..7507db493 100644 --- a/msvc/appCollisionDemo.rc +++ b/msvc/appCollisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CollisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionInterfaceDemo.rc b/msvc/appCollisionInterfaceDemo.rc index 41a74a119..9a3a3930f 100644 --- a/msvc/appCollisionInterfaceDemo.rc +++ b/msvc/appCollisionInterfaceDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CollisionInterfaceDemo" #ifdef CS_DEBUG diff --git a/msvc/appConcaveDemo.rc b/msvc/appConcaveDemo.rc index 3cc9062aa..feb7dc53b 100644 --- a/msvc/appConcaveDemo.rc +++ b/msvc/appConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appConstraintDemo.rc b/msvc/appConstraintDemo.rc index acada32d9..094fee1ab 100644 --- a/msvc/appConstraintDemo.rc +++ b/msvc/appConstraintDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConstraintDemo" #ifdef CS_DEBUG diff --git a/msvc/appContinuousConvexCollision.rc b/msvc/appContinuousConvexCollision.rc index d0da6c7a4..966d4ad13 100644 --- a/msvc/appContinuousConvexCollision.rc +++ b/msvc/appContinuousConvexCollision.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ContinuousConvexCollision" #ifdef CS_DEBUG diff --git a/msvc/appConvexDecompositionDemo.rc b/msvc/appConvexDecompositionDemo.rc index c8ee0fc9b..1beeee251 100644 --- a/msvc/appConvexDecompositionDemo.rc +++ b/msvc/appConvexDecompositionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConvexDecompositionDemo" #ifdef CS_DEBUG diff --git a/msvc/appDoublePrecisionDemo.rc b/msvc/appDoublePrecisionDemo.rc index c27989f63..2ce0114be 100644 --- a/msvc/appDoublePrecisionDemo.rc +++ b/msvc/appDoublePrecisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "DoublePrecisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appEPAPenDepthDemo.rc b/msvc/appEPAPenDepthDemo.rc index 799ac38c1..731b33a39 100644 --- a/msvc/appEPAPenDepthDemo.rc +++ b/msvc/appEPAPenDepthDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "EPAPenDepthDemo" #ifdef CS_DEBUG diff --git a/msvc/appGenericJointDemo.rc b/msvc/appGenericJointDemo.rc new file mode 100644 index 000000000..dc2d787ac --- /dev/null +++ b/msvc/appGenericJointDemo.rc @@ -0,0 +1,30 @@ +// This file is generated automatically. + +1 VERSIONINFO +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 +#ifdef CS_DEBUG +FILEFLAGS 0x1 +#else +FILEFLAGS 0x0 +#endif +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" + VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" + VALUE "FileDescription", "GenericJointDemo" +#ifdef CS_DEBUG + VALUE "Comments", "Debug build" +#else + VALUE "Comments", "Release build" +#endif + VALUE "WWW", "http://www.bulletphysics.com" + } + } +} +1 ICON "../../msvc/bullet_ico.ico" diff --git a/msvc/appGjkConvexCastDemo.rc b/msvc/appGjkConvexCastDemo.rc index 3b77b4345..0a2c727ec 100644 --- a/msvc/appGjkConvexCastDemo.rc +++ b/msvc/appGjkConvexCastDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "GjkConvexCastDemo" #ifdef CS_DEBUG diff --git a/msvc/appMovingConcaveDemo.rc b/msvc/appMovingConcaveDemo.rc index 6cd817a45..bea5538f2 100644 --- a/msvc/appMovingConcaveDemo.rc +++ b/msvc/appMovingConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "MovingConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appRagdollDemo.rc b/msvc/appRagdollDemo.rc index 7683a0c05..91121bc3f 100644 --- a/msvc/appRagdollDemo.rc +++ b/msvc/appRagdollDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "RagdollDemo" #ifdef CS_DEBUG diff --git a/msvc/appRaytracer.rc b/msvc/appRaytracer.rc index db13ab5c0..7325374eb 100644 --- a/msvc/appRaytracer.rc +++ b/msvc/appRaytracer.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "Raytracer" #ifdef CS_DEBUG diff --git a/msvc/appSimplexDemo.rc b/msvc/appSimplexDemo.rc index df493486e..2be864be6 100644 --- a/msvc/appSimplexDemo.rc +++ b/msvc/appSimplexDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "SimplexDemo" #ifdef CS_DEBUG diff --git a/msvc/appUserCollisionAlgorithm.rc b/msvc/appUserCollisionAlgorithm.rc index c7577ef55..0a71b612a 100644 --- a/msvc/appUserCollisionAlgorithm.rc +++ b/msvc/appUserCollisionAlgorithm.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "UserCollisionAlgorithm" #ifdef CS_DEBUG diff --git a/msvc/appVehicleDemo.rc b/msvc/appVehicleDemo.rc index ccd80f16f..9b06ceb85 100644 --- a/msvc/appVehicleDemo.rc +++ b/msvc/appVehicleDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 59, 0, 0 -PRODUCTVERSION 2, 59, 0, 0 +FILEVERSION 2, 61, 0, 0 +PRODUCTVERSION 2, 61, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.59" - VALUE "FileVersion", "2.59" + VALUE "ProductVersion", "2.61" + VALUE "FileVersion", "2.61" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "VehicleDemo" #ifdef CS_DEBUG