Changeset 1988

Timestamp:

Oct 20, 2008, 9:08:00 PM (16 years ago)

Author:

rgrieder

Message:

Tardis compiles both Bullet and OgreBullet completely. However there are a lot of warnings and I don't feel like correcting them all..

Location:

code/branches/physics/src

Files:

• ogrebullet/CMakeLists.txt (modified) (1 diff)
• ogrebullet/Collisions/CMakeLists.txt (modified) (1 diff)
• ogrebullet/Dynamics/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)

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

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(../bullet)
+INCLUDE_DIRECTORIES(Collisions)
+INCLUDE_DIRECTORIES(Dynamics)
 
 ADD_SUBDIRECTORY(Collisions)

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

@@ -28 +28 @@
 )
 
-INCLUDE_DIRECTORIES(.)
-
 ADD_LIBRARY(ogrebullet_collisions_orxonox STATIC ${OGREBULLET_COLLISIONS_SRC_FILES})

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

@@ -14 +14 @@
 )
 
-INCLUDE_DIRECTORIES(.)
-
 ADD_LIBRARY(ogrebullet_dynamics_orxonox STATIC ${OGREBULLET_DYNAMICS_SRC_FILES})

code/branches/physics/src/orxonox/CMakeLists.txt

@@ -107 +107 @@
   tolualib_orxonox
   ogreode_orxonox
+  LibLinearMath
+  LibBulletCollision
+  LibBulletDynamics
+  LibBulletSoftBody
+  ogrebullet_collisions_orxonox
+  ogrebullet_dynamics_orxonox
   util
   core