[Orxonox-commit 628] r3160 - in branches/pch: cmake src/core

rgrieder at orxonox.net rgrieder at orxonox.net
Sat Jun 13 22:24:14 CEST 2009


Author: rgrieder
Date: 2009-06-13 22:24:14 +0200 (Sat, 13 Jun 2009)
New Revision: 3160

Added:
   branches/pch/src/core/CorePrecompiledHeaders.h
Modified:
   branches/pch/cmake/PrecompiledHeaderFiles.cmake
   branches/pch/src/core/CMakeLists.txt
Log:
Added precompiled header file for the core library.
It contains as little as possible but enough to give a little speed up.
Note that Identifier.h is included because it makes a big difference and a change to it triggers an 80% rebuild anyway.

Modified: branches/pch/cmake/PrecompiledHeaderFiles.cmake
===================================================================
--- branches/pch/cmake/PrecompiledHeaderFiles.cmake	2009-06-13 16:41:05 UTC (rev 3159)
+++ branches/pch/cmake/PrecompiledHeaderFiles.cmake	2009-06-13 20:24:14 UTC (rev 3160)
@@ -100,7 +100,7 @@
   ELSEIF(CMAKE_COMPILER_IS_GNU)
 
     SET(_pch_file "${CMAKE_CURRENT_BINARY_DIR}/${_pch_header_filename}.gch")
-    SET(_pch_dep_helper_file "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}_pch_dependency_helper.cc")
+    SET(_pch_dep_helper_file "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}PCHDependencyHelper.h")
 
     # Append the gch-dir to make sure gcc finds the pch file
     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -121,7 +121,7 @@
         ENDIF()
         SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES
           COMPILE_FLAGS "${_old_flags} -include ${_pch_header_filename}"
-	  OBJECT_DEPENDS "${_pch_header_file};${_pch_file}"
+          OBJECT_DEPENDS "${_pch_header_file};${_pch_file}"
         )
       ENDIF(NOT _is_header)
     ENDFOREACH(_file)

Modified: branches/pch/src/core/CMakeLists.txt
===================================================================
--- branches/pch/src/core/CMakeLists.txt	2009-06-13 16:41:05 UTC (rev 3159)
+++ branches/pch/src/core/CMakeLists.txt	2009-06-13 20:24:14 UTC (rev 3160)
@@ -71,6 +71,8 @@
     LuaBind.h
   DEFINE_SYMBOL
     "CORE_SHARED_BUILD"
+  PCH_FILE
+    CorePrecompiledHeaders.h
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
     ${Boost_THREAD_LIBRARY}

Added: branches/pch/src/core/CorePrecompiledHeaders.h
===================================================================
--- branches/pch/src/core/CorePrecompiledHeaders.h	                        (rev 0)
+++ branches/pch/src/core/CorePrecompiledHeaders.h	2009-06-13 20:24:14 UTC (rev 3160)
@@ -0,0 +1,69 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+/**
+ at file
+ at brief
+    Compilation of the most often used header files in the core library
+*/
+
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cctype>
+#include <climits>
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <iostream>
+#include <list>
+#include <set>
+#include <map>
+#include <fstream>
+
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector4.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <ois/OISKeyboard.h>
+#include <ois/OISMouse.h>
+#include <ois/OISJoyStick.h>
+#include <tinyxml/ticpp.h>
+
+#include "util/Convert.h"
+#include "util/Debug.h"
+#include "util/Exception.h"
+#include "util/Math.h"
+#include "util/MultiType.h"
+#include "util/String.h"
+#include "util/SubString.h"
+
+// A change would trigger a 80% Core rebuild anyway
+#include "Identifier.h"


Property changes on: branches/pch/src/core/CorePrecompiledHeaders.h
___________________________________________________________________
Added: svn:eol-style
   + native




More information about the Orxonox-commit mailing list