X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/66a0ebcbe0599192cf7b1435a34840059e7d5dfc..4e6d43a2cb2caac745b99a66e881210bcb7f299d:/extern/bullet/Bullet/BLI_Bullet.dsp diff --git a/extern/bullet/Bullet/BLI_Bullet.dsp b/extern/bullet/Bullet/BLI_Bullet.dsp index 48b6e8bb335..f37ba5b08a8 100644 --- a/extern/bullet/Bullet/BLI_Bullet.dsp +++ b/extern/bullet/Bullet/BLI_Bullet.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -MTL=midl.exe LINK32=link.exe -lib +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /Zd /O2 /I "../LinearMath" /I "." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "BUM_INLINED" /D "USE_ALGEBRAIC" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,8 @@ PostBuild_Cmds=XCOPY /Y .\release\*.lib .\..\..\..\..\lib\windows\bullet\lib\*. # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -MTL=midl.exe LINK32=link.exe -lib +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "BUM_INLINED" /D "USE_ALGEBRAIC" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -159,10 +159,6 @@ SOURCE=.\NarrowPhaseCollision\BU_VertexPoly.h # End Source File # Begin Source File -SOURCE=.\NarrowPhaseCollision\CollisionMargin.h -# End Source File -# Begin Source File - SOURCE=.\NarrowPhaseCollision\ContinuousConvexCollision.cpp # End Source File # Begin Source File @@ -203,6 +199,14 @@ SOURCE=.\NarrowPhaseCollision\GjkPairDetector.h # End Source File # Begin Source File +SOURCE=.\NarrowPhaseCollision\ManifoldContactAddResult.cpp +# End Source File +# Begin Source File + +SOURCE=.\NarrowPhaseCollision\ManifoldContactAddResult.h +# End Source File +# Begin Source File + SOURCE=.\NarrowPhaseCollision\ManifoldPoint.h # End Source File # Begin Source File @@ -279,14 +283,6 @@ SOURCE=.\BroadphaseCollision\CollisionAlgorithm.h # End Source File # Begin Source File -SOURCE=.\BroadphaseCollision\CollisionDispatcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\BroadphaseCollision\CollisionDispatcher.h -# End Source File -# Begin Source File - SOURCE=.\BroadphaseCollision\SimpleBroadphase.cpp # End Source File # Begin Source File @@ -307,6 +303,18 @@ SOURCE=.\CollisionShapes\BoxShape.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\BvhTriangleMeshShape.cpp +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\BvhTriangleMeshShape.h +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\CollisionMargin.h +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\CollisionShape.cpp # End Source File # Begin Source File @@ -339,6 +347,14 @@ SOURCE=.\CollisionShapes\ConvexShape.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\ConvexTriangleCallback.cpp +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\ConvexTriangleCallback.h +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\CylinderShape.cpp # End Source File # Begin Source File @@ -347,6 +363,14 @@ SOURCE=.\CollisionShapes\CylinderShape.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\EmptyShape.cpp +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\EmptyShape.h +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\MinkowskiSumShape.cpp # End Source File # Begin Source File @@ -363,6 +387,14 @@ SOURCE=.\CollisionShapes\MultiSphereShape.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\OptimizedBvh.cpp +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\OptimizedBvh.h +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\PolyhedralConvexShape.cpp # End Source File # Begin Source File @@ -395,10 +427,22 @@ SOURCE=.\CollisionShapes\StridingMeshInterface.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\TriangleCallback.cpp +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\TriangleCallback.h # End Source File # Begin Source File +SOURCE=.\CollisionShapes\TriangleIndexVertexArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\CollisionShapes\TriangleIndexVertexArray.h +# End Source File +# Begin Source File + SOURCE=.\CollisionShapes\TriangleMesh.cpp # End Source File # Begin Source File