[Orxonox-commit 1150] r5871 - in code/branches/core5: cmake src/external/bullet src/external/bullet/BulletCollision src/external/bullet/BulletDynamics src/external/bullet/LinearMath src/external/ogreceguirenderer src/external/ois src/external/ois/linux src/external/ois/mac src/external/ois/win32 src/external/tinyxml src/external/tolua
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Oct 4 18:06:33 CEST 2009
Author: rgrieder
Date: 2009-10-04 18:06:33 +0200 (Sun, 04 Oct 2009)
New Revision: 5871
Modified:
code/branches/core5/cmake/SourceFileUtilities.cmake
code/branches/core5/src/external/bullet/BulletCollision/CMakeLists.txt
code/branches/core5/src/external/bullet/BulletDynamics/CMakeLists.txt
code/branches/core5/src/external/bullet/CMakeLists.txt
code/branches/core5/src/external/bullet/LinearMath/CMakeLists.txt
code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt
code/branches/core5/src/external/ois/CMakeLists.txt
code/branches/core5/src/external/ois/linux/CMakeLists.txt
code/branches/core5/src/external/ois/mac/CMakeLists.txt
code/branches/core5/src/external/ois/win32/CMakeLists.txt
code/branches/core5/src/external/tinyxml/CMakeLists.txt
code/branches/core5/src/external/tolua/CMakeLists.txt
Log:
Compiling our third party libraries with as few files as possible. There should be quite a speedup.
Modified: code/branches/core5/cmake/SourceFileUtilities.cmake
===================================================================
--- code/branches/core5/cmake/SourceFileUtilities.cmake 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/cmake/SourceFileUtilities.cmake 2009-10-04 16:06:33 UTC (rev 5871)
@@ -46,8 +46,9 @@
IF(NOT _compilation_name)
MESSAGE(FATAL_ERROR "No name provided for source file compilation")
ENDIF()
+ SET(_include_string)
FOREACH(_file2 ${_compilation})
- SET(_include_string "${_include_string}\n#include \"${_file2}\"")
+ SET(_include_string "${_include_string}#include \"${_file2}\"\n")
ENDFOREACH(_file2)
IF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name})
FILE(READ ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name} _include_string_file)
Modified: code/branches/core5/src/external/bullet/BulletCollision/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/bullet/BulletCollision/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/bullet/BulletCollision/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -1,4 +1,7 @@
ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletCollisionCompilation.cpp
+
BroadphaseCollision/btAxisSweep3.cpp
BroadphaseCollision/btBroadphaseProxy.cpp
BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -67,15 +70,11 @@
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
NarrowPhaseCollision/btGjkEpa2.cpp
@@ -89,6 +88,15 @@
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
BroadphaseCollision/btAxisSweep3.h
BroadphaseCollision/btBroadphaseInterface.h
Modified: code/branches/core5/src/external/bullet/BulletDynamics/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/bullet/BulletDynamics/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/bullet/BulletDynamics/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -1,4 +1,7 @@
ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletDynamicsCompilation.cpp
+
ConstraintSolver/btContactConstraint.cpp
ConstraintSolver/btConeTwistConstraint.cpp
ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -19,6 +22,8 @@
Character/btKinematicCharacterController.cpp
+COMPILATION_END
+
# Headers
ConstraintSolver/btConstraintSolver.h
ConstraintSolver/btContactConstraint.h
Modified: code/branches/core5/src/external/bullet/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/bullet/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/bullet/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -33,8 +33,6 @@
ORXONOX_ADD_LIBRARY(bullet_orxonox
ORXONOX_EXTERNAL
NO_DLL_INTERFACE
- PCH_FILE
- BulletPrecompiledHeaders.h
VERSION
2.74
SOURCE_FILES
Modified: code/branches/core5/src/external/bullet/LinearMath/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/bullet/LinearMath/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/bullet/LinearMath/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -1,8 +1,11 @@
ADD_SOURCE_FILES(BULLET_FILES
+
+COMPILATION_BEGIN BulletLinearMathCompilation.cpp
btConvexHull.cpp
btQuickprof.cpp
btGeometryUtil.cpp
btAlignedAllocator.cpp
+COMPILATION_END
# Headers
btAlignedObjectArray.h
Modified: code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -17,14 +17,16 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-SET(OCR_FILES
+SET_SOURCE_FILES(OCR_FILES
OgreCEGUIRenderer.h
OgreCEGUIResourceProvider.h
OgreCEGUITexture.h
+COMPILATION_BEGIN OgreCEGUIRendererCompilation.cpp
OgreCEGUIRenderer.cpp
OgreCEGUIResourceProvider.cpp
OgreCEGUITexture.cpp
+COMPILATION_END
)
# No warnings needed from third party libraries
Modified: code/branches/core5/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ois/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/ois/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -33,6 +33,7 @@
OISObject.h
OISPrereqs.h
+COMPILATION_BEGIN OISCompilation.cpp
OISEffect.cpp
OISException.cpp
OISForceFeedback.cpp
@@ -40,6 +41,7 @@
OISJoyStick.cpp
OISKeyboard.cpp
OISObject.cpp
+COMPILATION_END
)
IF(WIN32)
ADD_SUBDIRECTORY(win32)
Modified: code/branches/core5/src/external/ois/linux/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ois/linux/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/ois/linux/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -7,10 +7,12 @@
LinuxMouse.h
LinuxPrereqs.h
+COMPILATION_BEGIN OISLinuxCompilation.cpp
EventHelpers.cpp
LinuxForceFeedback.cpp
LinuxInputManager.cpp
LinuxJoyStickEvents.cpp
LinuxKeyboard.cpp
LinuxMouse.cpp
+COMPILATION_END
)
Modified: code/branches/core5/src/external/ois/mac/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ois/mac/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/ois/mac/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -6,9 +6,11 @@
MacMouse.h
MacPrereqs.h
+COMPILATION_BEGIN OISMacCompilation.cpp
MacHelpers.cpp
MacHIDManager.cpp
MacInputManager.cpp
MacKeyboard.cpp
MacMouse.cpp
+COMPILATION_END
)
Modified: code/branches/core5/src/external/ois/win32/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ois/win32/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/ois/win32/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -6,9 +6,11 @@
Win32Mouse.h
Win32Prereqs.h
+COMPILATION_BEGIN OISWin32Compilation.cpp
Win32ForceFeedback.cpp
Win32InputManager.cpp
Win32JoyStick.cpp
Win32KeyBoard.cpp
Win32Mouse.cpp
+COMPILATION_END
)
Modified: code/branches/core5/src/external/tinyxml/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/tinyxml/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/tinyxml/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -17,17 +17,19 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-SET(TINYXML++_FILES
+SET_SOURCE_FILES(TINYXML++_FILES
ticpp.h
ticpprc.h
tinystr.h
tinyxml.h
+COMPILATION_BEGIN TicppCompilation.cpp
ticpp.cpp
tinystr.cpp
tinyxml.cpp
tinyxmlerror.cpp
tinyxmlparser.cpp
+COMPILATION_END
)
# No warnings needed from third party libraries
Modified: code/branches/core5/src/external/tolua/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/tolua/CMakeLists.txt 2009-10-04 12:07:17 UTC (rev 5870)
+++ code/branches/core5/src/external/tolua/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
@@ -19,17 +19,17 @@
################### Tolua++ library ###################
-SET(TOLUA++_FILES
+SET_SOURCE_FILES(TOLUA++_FILES
tolua_event.h
tolua++.h
-
+COMPILATION_BEGIN ToluaCompilation.c
tolua_event.c
tolua_is.c
tolua_map.c
tolua_push.c
tolua_to.c
+COMPILATION_END
)
-GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
# No warnings needed from third party libraries
REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
More information about the Orxonox-commit
mailing list