Changeset 5929 for code/trunk/src/external/bullet/BulletCollision

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CMakeLists.txt (modified) (3 diffs)

code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletCollisionCompilation.cpp
+
         BroadphaseCollision/btAxisSweep3.cpp
         BroadphaseCollision/btBroadphaseProxy.cpp
@@ -68 +71 @@
         Gimpact/btContactProcessing.cpp
         Gimpact/btGImpactShape.cpp
-        Gimpact/gim_contact.cpp
         Gimpact/btGImpactBvh.cpp
         Gimpact/btGenericPoolAllocator.cpp
-        Gimpact/gim_memory.cpp
         Gimpact/btGImpactCollisionAlgorithm.cpp
         Gimpact/btTriangleShapeEx.cpp
-        Gimpact/gim_tri_collision.cpp
         Gimpact/btGImpactQuantizedBvh.cpp
-        Gimpact/gim_box_set.cpp
 
         NarrowPhaseCollision/btContinuousConvexCollision.cpp
@@ -89 +88 @@
         NarrowPhaseCollision/btSubSimplexConvexCast.cpp
         NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+
+COMPILATION_END
+
+COMPILATION_BEGIN BulletGImpactCompilation.cpp
+        Gimpact/gim_contact.cpp
+        Gimpact/gim_memory.cpp
+        Gimpact/gim_tri_collision.cpp
+        Gimpact/gim_box_set.cpp
+COMPILATION_END
 
         # Headers