diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp
index bf67fb59b..c4036df73 100644
--- a/msvc/6/appAllBulletDemos.dsp
+++ b/msvc/6/appAllBulletDemos.dsp
@@ -190,10 +190,18 @@ SOURCE=..\..\Demos\AllBulletDemos\..\CcdPhysicsDemo\CcdPhysicsDemo.cpp
# End Source File
# Begin Source File
+SOURCE=..\..\Demos\AllBulletDemos\..\ConcaveConvexcastDemo\ConcaveConvexcastDemo.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Demos\AllBulletDemos\..\ConcaveDemo\ConcavePhysicsDemo.cpp
# End Source File
# Begin Source File
+SOURCE=..\..\Demos\AllBulletDemos\..\ConcaveRaycastDemo\ConcaveRaycastDemo.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Demos\AllBulletDemos\..\ConstraintDemo\ConstraintDemo.cpp
# End Source File
# Begin Source File
@@ -202,6 +210,10 @@ SOURCE=..\..\Demos\AllBulletDemos\..\ConvexDecompositionDemo\ConvexDecomposition
# End Source File
# Begin Source File
+SOURCE=..\..\Demos\AllBulletDemos\..\DynamicControlDemo\MotorDemo.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Demos\AllBulletDemos\..\GimpactTestDemo\GimpactTestDemo.cpp
# End Source File
# Begin Source File
diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp
index 174dc1157..8bc3be81e 100644
--- a/msvc/6/libbulletcollision.dsp
+++ b/msvc/6/libbulletcollision.dsp
@@ -448,6 +448,10 @@ SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.h
# End Source File
# Begin Source File
+SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCallback.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h
# End Source File
# Begin Source File
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index 03f8de0a4..f829bbe04 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "appAllBulletDemos"=".\appAllBulletDemos.dsp" - Package Owner=<4>
+Project: "appAllBulletDemos"=.\appAllBulletDemos.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4>
###############################################################################
-Project: "appBasicDemo"=".\appBasicDemo.dsp" - Package Owner=<4>
+Project: "appBasicDemo"=.\appBasicDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4>
###############################################################################
-Project: "appBspDemo"=".\appBspDemo.dsp" - Package Owner=<4>
+Project: "appBspDemo"=.\appBspDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -87,7 +87,7 @@ Package=<4>
###############################################################################
-Project: "appBulletDino"=".\appBulletDino.dsp" - Package Owner=<4>
+Project: "appBulletDino"=.\appBulletDino.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +111,7 @@ Package=<4>
###############################################################################
-Project: "appCcdPhysicsDemo"=".\appCcdPhysicsDemo.dsp" - Package Owner=<4>
+Project: "appCcdPhysicsDemo"=.\appCcdPhysicsDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -135,7 +135,40 @@ Package=<4>
###############################################################################
-Project: "appCollisionDemo"=".\appCollisionDemo.dsp" - Package Owner=<4>
+Project: "appColladaDemo"=.\appColladaDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libBulletColladaConverter
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletcollision
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletdynamics
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletmath
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletopenglsupport
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libcolladadom
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name liblibxml
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "appCollisionDemo"=.\appCollisionDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +192,7 @@ Package=<4>
###############################################################################
-Project: "appCollisionInterfaceDemo"=".\appCollisionInterfaceDemo.dsp" - Package Owner=<4>
+Project: "appCollisionInterfaceDemo"=.\appCollisionInterfaceDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +216,7 @@ Package=<4>
###############################################################################
-Project: "appConcaveDemo"=".\appConcaveDemo.dsp" - Package Owner=<4>
+Project: "appConcaveDemo"=.\appConcaveDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +240,7 @@ Package=<4>
###############################################################################
-Project: "appConstraintDemo"=".\appConstraintDemo.dsp" - Package Owner=<4>
+Project: "appConstraintDemo"=.\appConstraintDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -231,7 +264,7 @@ Package=<4>
###############################################################################
-Project: "appContinuousConvexCollision"=".\appContinuousConvexCollision.dsp" - Package Owner=<4>
+Project: "appContinuousConvexCollision"=.\appContinuousConvexCollision.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -255,7 +288,7 @@ Package=<4>
###############################################################################
-Project: "appConvexDecompositionDemo"=".\appConvexDecompositionDemo.dsp" - Package Owner=<4>
+Project: "appConvexDecompositionDemo"=.\appConvexDecompositionDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -282,7 +315,7 @@ Package=<4>
###############################################################################
-Project: "appDoublePrecisionDemo"=".\appDoublePrecisionDemo.dsp" - Package Owner=<4>
+Project: "appDoublePrecisionDemo"=.\appDoublePrecisionDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -306,7 +339,7 @@ Package=<4>
###############################################################################
-Project: "appEPAPenDepthDemo"=".\appEPAPenDepthDemo.dsp" - Package Owner=<4>
+Project: "appEPAPenDepthDemo"=.\appEPAPenDepthDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -333,7 +366,7 @@ Package=<4>
###############################################################################
-Project: "appGenericJointDemo"=".\appGenericJointDemo.dsp" - Package Owner=<4>
+Project: "appGenericJointDemo"=.\appGenericJointDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -357,7 +390,7 @@ Package=<4>
###############################################################################
-Project: "appGimpactTestDemo"=".\appGimpactTestDemo.dsp" - Package Owner=<4>
+Project: "appGimpactTestDemo"=.\appGimpactTestDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -390,7 +423,7 @@ Package=<4>
###############################################################################
-Project: "appGjkConvexCastDemo"=".\appGjkConvexCastDemo.dsp" - Package Owner=<4>
+Project: "appGjkConvexCastDemo"=.\appGjkConvexCastDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -414,7 +447,7 @@ Package=<4>
###############################################################################
-Project: "appMovingConcaveDemo"=".\appMovingConcaveDemo.dsp" - Package Owner=<4>
+Project: "appMovingConcaveDemo"=.\appMovingConcaveDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -441,7 +474,7 @@ Package=<4>
###############################################################################
-Project: "appRagdollDemo"=".\appRagdollDemo.dsp" - Package Owner=<4>
+Project: "appRagdollDemo"=.\appRagdollDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -465,7 +498,7 @@ Package=<4>
###############################################################################
-Project: "appRaytracer"=".\appRaytracer.dsp" - Package Owner=<4>
+Project: "appRaytracer"=.\appRaytracer.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -489,7 +522,7 @@ Package=<4>
###############################################################################
-Project: "appSimplexDemo"=".\appSimplexDemo.dsp" - Package Owner=<4>
+Project: "appSimplexDemo"=.\appSimplexDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -513,7 +546,7 @@ Package=<4>
###############################################################################
-Project: "appUserCollisionAlgorithm"=".\appUserCollisionAlgorithm.dsp" - Package Owner=<4>
+Project: "appUserCollisionAlgorithm"=.\appUserCollisionAlgorithm.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -537,7 +570,7 @@ Package=<4>
###############################################################################
-Project: "appVehicleDemo"=".\appVehicleDemo.dsp" - Package Owner=<4>
+Project: "appVehicleDemo"=.\appVehicleDemo.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -561,7 +594,7 @@ Package=<4>
###############################################################################
-Project: "grpall_bullet"=".\grpall_bullet.dsp" - Package Owner=<4>
+Project: "grpall_bullet"=.\grpall_bullet.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -585,6 +618,9 @@ Package=<4>
Project_Dep_Name appCcdPhysicsDemo
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name appColladaDemo
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name appCollisionDemo
End Project Dependency
Begin Project Dependency
@@ -651,10 +687,10 @@ Package=<4>
Project_Dep_Name libbulletmath
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libbulletmultithreaded
+ Project_Dep_Name libbulletopenglsupport
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libbulletopenglsupport
+ Project_Dep_Name libcolladadom
End Project Dependency
Begin Project Dependency
Project_Dep_Name libconvexdecomposition
@@ -669,13 +705,16 @@ Package=<4>
Project_Dep_Name libglui
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name liblibxml
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name libquickstep
End Project Dependency
}}}
###############################################################################
-Project: "grpapps_bullet"=".\grpapps_bullet.dsp" - Package Owner=<4>
+Project: "grpapps_bullet"=.\grpapps_bullet.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -699,6 +738,9 @@ Package=<4>
Project_Dep_Name appCcdPhysicsDemo
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name appColladaDemo
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name appCollisionDemo
End Project Dependency
Begin Project Dependency
@@ -753,7 +795,7 @@ Package=<4>
###############################################################################
-Project: "grplibs_bullet"=".\grplibs_bullet.dsp" - Package Owner=<4>
+Project: "grplibs_bullet"=.\grplibs_bullet.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -777,10 +819,10 @@ Package=<4>
Project_Dep_Name libbulletmath
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libbulletmultithreaded
+ Project_Dep_Name libbulletopenglsupport
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libbulletopenglsupport
+ Project_Dep_Name libcolladadom
End Project Dependency
Begin Project Dependency
Project_Dep_Name libconvexdecomposition
@@ -795,13 +837,16 @@ Package=<4>
Project_Dep_Name libglui
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name liblibxml
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name libquickstep
End Project Dependency
}}}
###############################################################################
-Project: "libBulletColladaConverter"=".\libBulletColladaConverter.dsp" - Package Owner=<4>
+Project: "libboxbox"=.\libboxbox.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -813,7 +858,7 @@ Package=<4>
###############################################################################
-Project: "libGIMPACT"=".\libGIMPACT.dsp" - Package Owner=<4>
+Project: "libBulletColladaConverter"=.\libBulletColladaConverter.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -825,7 +870,7 @@ Package=<4>
###############################################################################
-Project: "libGIMPACTUtils"=".\libGIMPACTUtils.dsp" - Package Owner=<4>
+Project: "libbulletcollision"=.\libbulletcollision.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -837,7 +882,7 @@ Package=<4>
###############################################################################
-Project: "libboxbox"=".\libboxbox.dsp" - Package Owner=<4>
+Project: "libbulletdynamics"=.\libbulletdynamics.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -849,7 +894,7 @@ Package=<4>
###############################################################################
-Project: "libbulletcollision"=".\libbulletcollision.dsp" - Package Owner=<4>
+Project: "libbulletmath"=.\libbulletmath.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -861,7 +906,7 @@ Package=<4>
###############################################################################
-Project: "libbulletdynamics"=".\libbulletdynamics.dsp" - Package Owner=<4>
+Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -873,7 +918,7 @@ Package=<4>
###############################################################################
-Project: "libbulletmath"=".\libbulletmath.dsp" - Package Owner=<4>
+Project: "libcolladadom"=.\libcolladadom.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -885,7 +930,7 @@ Package=<4>
###############################################################################
-Project: "libbulletmultithreaded"=".\libbulletmultithreaded.dsp" - Package Owner=<4>
+Project: "libconvexdecomposition"=.\libconvexdecomposition.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -897,7 +942,7 @@ Package=<4>
###############################################################################
-Project: "libbulletopenglsupport"=".\libbulletopenglsupport.dsp" - Package Owner=<4>
+Project: "libGIMPACT"=.\libGIMPACT.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -909,7 +954,7 @@ Package=<4>
###############################################################################
-Project: "libconvexdecomposition"=".\libconvexdecomposition.dsp" - Package Owner=<4>
+Project: "libGIMPACTUtils"=.\libGIMPACTUtils.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -921,7 +966,7 @@ Package=<4>
###############################################################################
-Project: "libglui"=".\libglui.dsp" - Package Owner=<4>
+Project: "libglui"=.\libglui.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -933,7 +978,19 @@ Package=<4>
###############################################################################
-Project: "libquickstep"=".\libquickstep.dsp" - Package Owner=<4>
+Project: "liblibxml"=.\liblibxml.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libquickstep"=.\libquickstep.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/msvc/6/wksbullet_corelib.dsw b/msvc/6/wksbullet_corelib.dsw
index a36667998..4ad03e67b 100644
--- a/msvc/6/wksbullet_corelib.dsw
+++ b/msvc/6/wksbullet_corelib.dsw
@@ -3,54 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "libbulletcollision"=.\libbulletcollision.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libbulletdynamics"=.\libbulletdynamics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libbulletmath"=.\libbulletmath.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Global:
Package=<5>
diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj
index 1d050b0f7..2823b92d9 100644
--- a/msvc/7/appAllBulletDemos.vcproj
+++ b/msvc/7/appAllBulletDemos.vcproj
@@ -316,15 +316,24 @@
+
+
+
+
+
+
diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj
index 5b06d2b27..b674810ef 100644
--- a/msvc/7/libbulletcollision.vcproj
+++ b/msvc/7/libbulletcollision.vcproj
@@ -502,6 +502,9 @@
+
+
diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln
index 468992579..31d59c025 100644
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -62,8 +62,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}"
@@ -221,15 +219,14 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
- {6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
- {6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
- {6210A080-01C0-6D67-F1DB-669393175402}.34 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
- {6210A080-01C0-6D67-F1DB-669393175402}.35 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.36 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+ {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+ {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+ {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+ {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -258,15 +255,14 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {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}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {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}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -517,14 +513,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..419c88a33 100644
--- a/msvc/7/wksbullet_corelib.sln
+++ b/msvc/7/wksbullet_corelib.sln
@@ -1,13 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 7.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
-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
@@ -18,38 +10,6 @@ Global
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.Build.0 = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.ActiveCfg = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.Build.0 = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.ActiveCfg = Debug|Win32
- {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/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj
index c4d89904e..05c35d2f6 100644
--- a/msvc/71/appAllBulletDemos.vcproj
+++ b/msvc/71/appAllBulletDemos.vcproj
@@ -316,15 +316,24 @@
+
+
+
+
+
+
diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj
index 0621b0f3e..3a09c464d 100644
--- a/msvc/71/libbulletcollision.vcproj
+++ b/msvc/71/libbulletcollision.vcproj
@@ -502,6 +502,9 @@
+
+
diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln
index 3773501c6..ffbd0ccd4 100644
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -62,8 +62,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}"
@@ -221,15 +219,14 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
- {6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
- {6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
- {6210A080-01C0-6D67-F1DB-669393175402}.34 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
- {6210A080-01C0-6D67-F1DB-669393175402}.35 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.36 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+ {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+ {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+ {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+ {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -258,15 +255,14 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {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}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {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}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -517,14 +513,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..cf5d1a442 100644
--- a/msvc/71/wksbullet_corelib.sln
+++ b/msvc/71/wksbullet_corelib.sln
@@ -1,13 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 8.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
-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
@@ -18,38 +10,6 @@ Global
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.Build.0 = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.ActiveCfg = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.Build.0 = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.ActiveCfg = Debug|Win32
- {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/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj
index e0370a4d3..5f6b5fa73 100644
--- a/msvc/8/appAllBulletDemos.vcproj
+++ b/msvc/8/appAllBulletDemos.vcproj
@@ -316,15 +316,24 @@
+
+
+
+
+
+
diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj
index 5369e3254..03d175b3f 100644
--- a/msvc/8/libbulletcollision.vcproj
+++ b/msvc/8/libbulletcollision.vcproj
@@ -502,6 +502,9 @@
+
+
diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln
index 121912b46..d0da1c155 100644
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -62,8 +62,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}"
@@ -221,15 +219,14 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
- {6210A080-01C0-6D67-F1DB-669393175402}.31 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
- {6210A080-01C0-6D67-F1DB-669393175402}.32 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.33 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
- {6210A080-01C0-6D67-F1DB-669393175402}.34 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
- {6210A080-01C0-6D67-F1DB-669393175402}.35 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.36 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
+ {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+ {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
+ {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142}
+ {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7}
+ {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -258,15 +255,14 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
- {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}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {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}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32
@@ -517,14 +513,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..7a51b0398 100644
--- a/msvc/8/wksbullet_corelib.sln
+++ b/msvc/8/wksbullet_corelib.sln
@@ -1,13 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
-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
@@ -18,38 +10,6 @@ Global
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.Build.0 = Debug|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.ActiveCfg = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Release.Build.0 = Release|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.ActiveCfg = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.Debug.Build.0 = Debug|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {61BD1097-CF2E-B296-DAA9-73A6FE135319}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.ActiveCfg = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release.Build.0 = Release|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.ActiveCfg = Debug|Win32
- {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