Changeset 8729 for code/trunk/src/external

Timestamp:

Jul 4, 2011, 2:47:44 AM (14 years ago)

Author:

rgrieder

Message:

Merged unity_build branch back to trunk.

Features:

• Implemented fully automatic build units to speed up compilation if requested
• Added DOUT macro for quick debug output
• Activated text colouring in the POSIX IOConsole
• DeclareToluaInterface is not necessary anymore

Improvements:

• Output levels now change appropriately when switch back and forth from dev mode
• Log level for the file output is now also correct during startup
• Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

• Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

• It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CMakeLists.txt (modified) (2 diffs)
• src/external/bullet/BulletDynamics/CMakeLists.txt (modified) (2 diffs)
• src/external/bullet/CMakeLists.txt (modified) (1 diff)
• src/external/bullet/LinearMath/CMakeLists.txt (modified) (2 diffs)
• src/external/enet/CMakeLists.txt (modified) (2 diffs)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (4 diffs)
• src/external/ois/linux/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/mac/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/win32/CMakeLists.txt (modified) (2 diffs)
• src/external/tinyxml/CMakeLists.txt (modified) (2 diffs)
• src/external/tolua/lua/basic.lua (modified) (1 diff)
• src/external/tolua/lua/package.lua (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
@@ -84 +82 @@
         NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
         NarrowPhaseCollision/btPersistentManifold.cpp
+        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
         NarrowPhaseCollision/btRaycastCallback.cpp
         NarrowPhaseCollision/btSubSimplexConvexCast.cpp
         NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
 
-COMPILATION_END
-
-    # Raises compiler errors when compiled inside the compilation
-        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
 
         # Headers

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-COMPILATION_BEGIN BulletDynamicsCompilation.cpp
 
         Character/btKinematicCharacterController.cpp
@@ -25 +23 @@
         Vehicle/btRaycastVehicle.cpp
         Vehicle/btWheelInfo.cpp
-
-COMPILATION_END
 
         # Headers

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

@@ -32 +32 @@
   VERSION
     2.78
+  EXCLUDE_FROM_BUILD_UNITS
+    BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
   SOURCE_FILES
     ${BULLET_FILES}

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
 
-COMPILATION_BEGIN BulletLinearMathCompilation.cpp
         btAlignedAllocator.cpp
         btConvexHull.cpp
-    btConvexHullComputer.cpp
+        btConvexHullComputer.cpp
         btGeometryUtil.cpp
         btQuickprof.cpp
         btSerializer.cpp
-COMPILATION_END
 
         # Headers
@@ -15 +13 @@
         btAlignedObjectArray.h
         btConvexHull.h
-    btConvexHullComputer.h
+        btConvexHullComputer.h
         btDefaultMotionState.h
         btGeometryUtil.h

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

@@ -29 +29 @@
     win32.h
 
-COMPILATION_BEGIN ENetCompilation.c
     callbacks.c
     compress.c
@@ -39 +38 @@
     unix.c
     win32.c
-COMPILATION_END
 )
 

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

@@ -23 +23 @@
   OgreCEGUITexture.h
 
-COMPILATION_BEGIN OgreCEGUIRendererCompilation.cpp
   OgreCEGUIRenderer.cpp
   OgreCEGUIResourceProvider.cpp
   OgreCEGUITexture.cpp
-COMPILATION_END
 )
 

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

@@ -35 +35 @@
   OISPrereqs.h
 
-#COMPILATION_BEGIN OISCompilation.cpp
   OISEffect.cpp
   OISException.cpp
@@ -43 +42 @@
   OISKeyboard.cpp
   OISObject.cpp
-#COMPILATION_END
 )
+
 IF(WIN32)
   ADD_SUBDIRECTORY(win32)
@@ -56 +55 @@
 IF(MINGW)
   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
+ENDIF()
+
+# Apple has problems with OIS and build units
+IF(APPLE)
+  SET(USE_BUILD_UNITS NO_BUILD_UNITS)
 ENDIF()
 
@@ -72 +76 @@
   LINK_LIBS_LINUX
     X11
+  ${USE_BUILD_UNITS}
   SOURCE_FILES
     ${OIS_FILES}

code/trunk/src/external/ois/linux/CMakeLists.txt

@@ -8 +8 @@
   LinuxPrereqs.h
 
-COMPILATION_BEGIN OISLinuxCompilation.cpp
   EventHelpers.cpp
   LinuxForceFeedback.cpp
@@ -15 +14 @@
   LinuxKeyboard.cpp
   LinuxMouse.cpp
-COMPILATION_END
 )

code/trunk/src/external/ois/mac/CMakeLists.txt

@@ -8 +8 @@
   MacPrereqs.h
 
-#COMPILATION_BEGIN OISMacCompilation.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
@@ -15 +14 @@
   MacKeyboard.cpp
   MacMouse.cpp
-#COMPILATION_END
 )

code/trunk/src/external/ois/win32/CMakeLists.txt

@@ -7 +7 @@
   Win32Prereqs.h
 
-COMPILATION_BEGIN OISWin32Compilation.cpp
   Win32ForceFeedback.cpp
   Win32InputManager.cpp
@@ -13 +12 @@
   Win32KeyBoard.cpp
   Win32Mouse.cpp
-COMPILATION_END
 )

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

@@ -24 +24 @@
   tinyxml.h
 
-COMPILATION_BEGIN TicppCompilation.cpp
   ticpp.cpp
   tinystr.cpp
@@ -30 +29 @@
   tinyxmlerror.cpp
   tinyxmlparser.cpp
-COMPILATION_END
 )
 

code/trunk/src/external/tolua/lua/basic.lua

@@ -354 +354 @@
 end
 
-
+-- called after all the required C++ includes have been written
+function post_include_hook(package_name)
+end

code/trunk/src/external/tolua/lua/package.lua

@@ -135 +135 @@
         i = i+1
     end
+
+    post_include_hook(self.name)
 
     output('\n')