Changeset 1995

Timestamp:

Oct 22, 2008, 3:56:31 PM (16 years ago)

Author:

martisty

Message:

Corrected CMLs in bullet, ogrebullet and global include directories.
Added new test class for OgreBullet.

Location:

code/branches/physics/src

Files:

• CMakeLists.txt (modified) (1 diff)
• bullet/CMakeLists.txt (modified) (1 diff)
• ogrebullet/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/HelloBullet.cc (added)
• orxonox/objects/HelloBullet.h (added)

code/branches/physics/src/CMakeLists.txt

@@ -2 +2 @@
 INCLUDE_DIRECTORIES(..)
 INCLUDE_DIRECTORIES(orxonox)
+INCLUDE_DIRECTORIES(bullet)
+INCLUDE_DIRECTORIES(ogrebullet/Dynamics)
+INCLUDE_DIRECTORIES(ogrebullet/Collisions)
 
 ADD_SUBDIRECTORY(cpptcl)

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

@@ -1 @@
-INCLUDE_DIRECTORIES(.)
-
 ADD_SUBDIRECTORY(BulletSoftBody)
 ADD_SUBDIRECTORY(BulletCollision)

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

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

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

@@ -49 +49 @@
   objects/NPC.cc
   objects/ParticleSpawner.cc
-  objects/PhysicsTest.cc
+#  objects/PhysicsTest.cc
+  objects/HelloBullet.cc
   objects/Radar.cc
   objects/RadarListener.cc