Changeset 2141 for code/branches/physics/src

Timestamp:

Nov 5, 2008, 1:01:57 PM (16 years ago)

Author:

rgrieder

Message:

Fixed static linker problem with bullet and gcc: We have to specify the libraries in reverse dependency order.

Location:

code/branches/physics/src

Files:

• bullet/BulletCollision/CMakeLists.txt (modified) (1 diff)
• bullet/BulletDynamics/CMakeLists.txt (modified) (1 diff)
• bullet/BulletSoftBody/CMakeLists.txt (modified) (1 diff)
• bullet/LinearMath/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)

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

@@ -1 @@
-ADD_LIBRARY(LibBulletCollision SHARED
+ADD_LIBRARY(LibBulletCollision
                                 BroadphaseCollision/btAxisSweep3.cpp
                                 BroadphaseCollision/btAxisSweep3.h

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

@@ -1 @@
-ADD_LIBRARY(LibBulletDynamics SHARED
+ADD_LIBRARY(LibBulletDynamics
 
         ConstraintSolver/btContactConstraint.cpp

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

@@ -1 @@
-ADD_LIBRARY(LibBulletSoftBody SHARED
+ADD_LIBRARY(LibBulletSoftBody
         btSoftBody.cpp
         btSoftBody.h

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

@@ -1 @@
-ADD_LIBRARY(LibLinearMath SHARED
+ADD_LIBRARY(LibLinearMath
                 btAlignedObjectArray.h
                 btList.h

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

@@ -146 +146 @@
   tinyxml_orxonox
   tolualib_orxonox
+#LibBulletSoftBody
+  LibBulletDynamics
+  LibBulletCollision
   LibLinearMath
-  LibBulletCollision
-  LibBulletDynamics
-  LibBulletSoftBody
-  ogrebullet_collisions_orxonox
-  ogrebullet_dynamics_orxonox
+#ogrebullet_collisions_orxonox
+#ogrebullet_dynamics_orxonox
   util
   core