Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp')
-rw-r--r--extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp74
1 files changed, 55 insertions, 19 deletions
diff --git a/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp b/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
index 2e13283b512..5ebbb63f2ae 100644
--- a/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
+++ b/extern/bullet/BulletDynamics/BLI_BulletDynamics.dsp
@@ -8,12 +8,12 @@ CFG=BulletDynamics - Win32 Debug
!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 "BulletDynamics.mak".
+!MESSAGE NMAKE /f "BLI_BulletDynamics.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 "BulletDynamics.mak" CFG="BulletDynamics - Win32 Debug"
+!MESSAGE NMAKE /f "BLI_BulletDynamics.mak" CFG="BulletDynamics - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -40,8 +40,8 @@ RSC=rc.exe
# PROP Output_Dir "BulletDynamics___Win32_Release"
# PROP Intermediate_Dir "BulletDynamics___Win32_Release"
# PROP Target_Dir ""
-LINK32=link.exe -lib
MTL=midl.exe
+LINK32=link.exe -lib
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -65,8 +65,8 @@ LIB32=link.exe -lib
# PROP Output_Dir "BulletDynamics___Win32_Debug"
# PROP Intermediate_Dir "BulletDynamics___Win32_Debug"
# PROP Target_Dir ""
-LINK32=link.exe -lib
MTL=midl.exe
+LINK32=link.exe -lib
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -105,23 +105,23 @@ SOURCE=.\ConstraintSolver\ContactSolverInfo.h
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\HingeConstraint.cpp
+SOURCE=.\ConstraintSolver\Generic6DofConstraint.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\HingeConstraint.h
+SOURCE=.\ConstraintSolver\Generic6DofConstraint.h
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\JacobianEntry.h
+SOURCE=.\ConstraintSolver\HingeConstraint.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\OdeConstraintSolver.cpp
+SOURCE=.\ConstraintSolver\HingeConstraint.h
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\OdeConstraintSolver.h
+SOURCE=.\ConstraintSolver\JacobianEntry.h
# End Source File
# Begin Source File
@@ -133,11 +133,11 @@ SOURCE=.\ConstraintSolver\Point2PointConstraint.h
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\SimpleConstraintSolver.cpp
+SOURCE=.\ConstraintSolver\SequentialImpulseConstraintSolver.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\SimpleConstraintSolver.h
+SOURCE=.\ConstraintSolver\SequentialImpulseConstraintSolver.h
# End Source File
# Begin Source File
@@ -149,14 +149,6 @@ SOURCE=.\ConstraintSolver\Solve2LinearConstraint.h
# End Source File
# Begin Source File
-SOURCE=.\ConstraintSolver\SorLcp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ConstraintSolver\SorLcp.h
-# End Source File
-# Begin Source File
-
SOURCE=.\ConstraintSolver\TypedConstraint.cpp
# End Source File
# Begin Source File
@@ -220,5 +212,49 @@ SOURCE=.\Vehicle\WheelInfo.cpp
SOURCE=.\Vehicle\WheelInfo.h
# End Source File
# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_DynamicTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IMotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IMotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IVehicle.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_IVehicle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\common\PHY_Pro.h
+# End Source File
+# End Group
# End Target
# End Project