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

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)
• src/external/bullet/BulletDynamics/CMakeLists.txt (modified) (2 diffs)
• src/external/bullet/BulletPrecompiledHeaders.h (deleted)
• src/external/bullet/CMakeLists.txt (modified) (1 diff)
• src/external/bullet/LinearMath/CMakeLists.txt (modified) (1 diff)

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

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletDynamicsCompilation.cpp
+
         ConstraintSolver/btContactConstraint.cpp
         ConstraintSolver/btConeTwistConstraint.cpp
@@ -19 +22 @@
 
         Character/btKinematicCharacterController.cpp
+
+COMPILATION_END
 
         # Headers

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

@@ -27 +27 @@
 ADD_SUBDIRECTORY(LinearMath)
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 ORXONOX_ADD_LIBRARY(bullet_orxonox
   ORXONOX_EXTERNAL
   NO_DLL_INTERFACE
-  PCH_FILE
-    BulletPrecompiledHeaders.h
   VERSION
     2.74

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletLinearMathCompilation.cpp
                 btConvexHull.cpp
                 btQuickprof.cpp
                 btGeometryUtil.cpp
                 btAlignedAllocator.cpp
+COMPILATION_END
 
                 # Headers