updated projectfiles for moved files, disable EPA demo (temporarily)

This commit is contained in:
ejcoumans
2006-06-29 21:10:32 +00:00
parent 9105c3af5a
commit 16116177a7
19 changed files with 717 additions and 2047 deletions

View File

@@ -1,119 +0,0 @@
# Microsoft Developer Studio Project File - Name="appEPAPenDepthDemo" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=appEPAPenDepthDemo - 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 "appEPAPenDepthDemo.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 "appEPAPenDepthDemo.mak" CFG="appEPAPenDepthDemo - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "appEPAPenDepthDemo - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "appEPAPenDepthDemo - 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)" == "appEPAPenDepthDemo - 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\appEPAPenDepthDemo\"
# PROP Intermediate_Dir "..\..\out\release6\build\appEPAPenDepthDemo\"
# 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 "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
# 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\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
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:"..\..\EPAPenDepthDemo.exe" /subsystem:console /libpath:"..\..\Glut"
# Begin Special Build Tool
SOURCE="$(InputPath)"
# End Special Build Tool
!ELSEIF "$(CFG)" == "appEPAPenDepthDemo - 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\appEPAPenDepthDemo\"
# PROP Intermediate_Dir "..\..\out\debug6\build\appEPAPenDepthDemo\"
# 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 "..\..\Bullet" /I "..\..\BulletDynamics" /I "..\..\LinearMath" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics"
# 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\appEPAPenDepthDemo\appEPAPenDepthDemo.res" /i "." /i "..\.." /i "..\..\Bullet" /i "..\..\BulletDynamics" /i "..\..\LinearMath" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics"
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:"..\..\EPAPenDepthDemo.exe" /subsystem:console /libpath:"..\..\Glut"
# Begin Special Build Tool
SOURCE="$(InputPath)"
# End Special Build Tool
!ENDIF
# Begin Target
# Name "appEPAPenDepthDemo - Win32 Release"
# Name "appEPAPenDepthDemo - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Demos\EPAPenDepthDemo\EpaPenDepthDemo.cpp
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\msvc\appEPAPenDepthDemo.rc
# End Source File
# End Group
# End Target
# End Project

View File

@@ -120,6 +120,10 @@ SOURCE=..\..\Bullet\BroadphaseCollision\Dispatcher.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\BroadphaseCollision\OverlappingPairCache.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp
# End Source File
# Begin Source File
@@ -244,30 +248,6 @@ SOURCE=..\..\Bullet\CollisionShapes\TriangleMeshShape.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_AlgebraicPolynomialSolver.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_Collidable.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_CollisionPair.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_EdgeEdge.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_Screwing.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.cpp
# End Source File
# Begin Source File
@@ -276,22 +256,6 @@ SOURCE=..\..\Bullet\NarrowPhaseCollision\ConvexCast.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\Epa.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaFace.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaPenetrationDepthSolver.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaPolyhedron.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkConvexCast.cpp
# End Source File
# Begin Source File
@@ -356,6 +320,10 @@ SOURCE=..\..\Bullet\BroadphaseCollision\Dispatcher.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\BroadphaseCollision\OverlappingPairCache.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h
# End Source File
# Begin Source File
@@ -488,42 +456,6 @@ SOURCE=..\..\Bullet\CollisionShapes\TriangleShape.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_AlgebraicPolynomialSolver.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_Collidable.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_CollisionPair.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_EdgeEdge.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_MotionStateInterface.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_PolynomialSolverInterface.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_Screwing.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_StaticMotionState.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h
# End Source File
# Begin Source File
@@ -544,34 +476,6 @@ SOURCE=..\..\Bullet\NarrowPhaseCollision\DiscreteCollisionDetectorInterface.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\Epa.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaCommon.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaFace.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaHalfEdge.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaPenetrationDepthSolver.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaPolyhedron.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\EpaVertex.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\NarrowPhaseCollision\GjkConvexCast.h
# End Source File
# Begin Source File

View File

@@ -116,15 +116,11 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.cpp
SOURCE=..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.cpp
# End Source File
# Begin Source File
@@ -132,10 +128,6 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\SorLcp.cpp
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp
# End Source File
# Begin Source File
@@ -180,15 +172,11 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h
SOURCE=..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.h
# End Source File
# Begin Source File
@@ -196,10 +184,6 @@ SOURCE=..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\SorLcp.h
# End Source File
# Begin Source File
SOURCE=..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h
# End Source File
# Begin Source File

View File

@@ -261,36 +261,6 @@ Package=<4>
###############################################################################
Project: "appEPAPenDepthDemo"=.\appEPAPenDepthDemo.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libbullet
End Project Dependency
Begin Project Dependency
Project_Dep_Name libbulletccdphysics
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 libbulletphysicsinterfacecommon
End Project Dependency
}}}
###############################################################################
Project: "appGjkConvexCastDemo"=.\appGjkConvexCastDemo.dsp - Package Owner=<4>
Package=<5>
@@ -414,9 +384,6 @@ Package=<4>
Project_Dep_Name appConvexDecompositionDemo
End Project Dependency
Begin Project Dependency
Project_Dep_Name appEPAPenDepthDemo
End Project Dependency
Begin Project Dependency
Project_Dep_Name appGjkConvexCastDemo
End Project Dependency
Begin Project Dependency
@@ -489,9 +456,6 @@ Package=<4>
Project_Dep_Name appConvexDecompositionDemo
End Project Dependency
Begin Project Dependency
Project_Dep_Name appEPAPenDepthDemo
End Project Dependency
Begin Project Dependency
Project_Dep_Name appGjkConvexCastDemo
End Project Dependency
Begin Project Dependency