Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1983 for code/branches/physics


Ignore:
Timestamp:
Oct 20, 2008, 7:01:52 PM (16 years ago)
Author:
rgrieder
Message:

Some minor adjustments to compile OgreBullet with CMake.

Location:
code/branches/physics/src
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • code/branches/physics/src/bullet/BulletCollision/GIMPACT

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/ceguilua/src/bullet/BulletCollision/Gimpact1802-1808
      /code/branches/core3/src/bullet/BulletCollision/Gimpact1572-1739
      /code/branches/gcc43/src/bullet/BulletCollision/Gimpact1580
      /code/branches/gui/src/bullet/BulletCollision/Gimpact1635-1723
      /code/branches/input/src/bullet/BulletCollision/Gimpact1629-1636

  • code/branches/physics/src/bullet/CMakeLists.txt

    r1972 r1983  
    44ADD_SUBDIRECTORY(BulletCollision)
    55ADD_SUBDIRECTORY(BulletDynamics)
    6 ADD_SUBDIRECTORY(BulletLinearMath)
     6ADD_SUBDIRECTORY(LinearMath)

  • code/branches/physics/src/bullet/LinearMath/CMakeLists.txt

    r1963 r1983  
    1 ADD_LIBRARY(LibBulletLinearMath
     1ADD_LIBRARY(LibLinearMath
    22                btAlignedObjectArray.h
    33                btList.h

  • code/branches/physics/src/ogrebullet/CMakeLists.txt

    r1971 r1983  
    66  OgreBulletCollisionsWorld.cpp
    77 
    8   Debug/OgreBulletCollisionsDebugContanct.cpp
     8  Debug/OgreBulletCollisionsDebugContact.cpp
    99  Debug/OgreBulletCollisionsDebugDrawer.cpp
    1010  Debug/OgreBulletCollisionsDebugLines.cpp
    … …  
    3535  OgreBulletDynamicsWorld.cpp
    3636 
    37   Contraints/OgreBulletDynamics6DofContraints.cpp
    38   Contraints/OgreBulletDynamicsConeTwistContraint.cpp
    39   Contraints/OgreBulletDynamicsHingeConstraint.cpp
    40   Contraints/OgreBulletDynamicsPoint2pointContraint.cpp
    41   Contraints/OgreBulletDynamicsRaycastVehicle.cpp
     37  Constraints/OgreBulletDynamics6DofConstraint.cpp
     38  Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
     39  Constraints/OgreBulletDynamicsHingeConstraint.cpp
     40  Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
     41  Constraints/OgreBulletDynamicsRaycastVehicle.cpp
    4242 
    4343  Prefab/OgreBulletDynamicsRagDoll.cpp
    … …  
    4545
    4646INCLUDE_DIRECTORIES(.)
     47INCLUDE_DIRECTORIES(../bullet)
    4748
    4849ADD_LIBRARY(ogrebullet_orxonox STATIC ${OGREBULLET_SRC_FILES})
Note: See TracChangeset for help on using the changeset viewer.