Changeset 3190

Timestamp:

Jun 17, 2009, 9:51:00 PM (15 years ago)

Author:

rgrieder

Message:

Optimised precompiled header files for core and network (optimised with MSVC9 and MinGW (GCC 3.4))

Location:

code/branches/pch/src

Files:

• core/CorePrecompiledHeaders.h (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• network/NetworkPrecompiledHeaders.h (added)

code/branches/pch/src/core/CorePrecompiledHeaders.h

@@ -30 +30 @@
 @file
 @brief
-    Compilation of the most often used header files in the core library
+    Compilation of the most often used header files in the core library for MSVC
 */
 
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-#include <cctype>
-#include <climits>
+#include "CorePrereqs.h"
 
-#include <string>
-#include <sstream>
-#include <vector>
+#include <fstream>
 #include <iostream>
 #include <list>
+#include <map>
 #include <set>
-#include <map>
-#include <fstream>
+#include <sstream>
+#include <string>
+#include <vector>
 
-#include <OgreVector2.h>
-#include <OgreVector3.h>
-#include <OgreVector4.h>
-#include <OgreQuaternion.h>
-#include <OgreColourValue.h>
+
+#ifdef ORXONOX_COMPILER_MSVC
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef max
+#undef min
+
 #include <ois/OISKeyboard.h>
 #include <ois/OISMouse.h>
 #include <ois/OISJoyStick.h>
 #include <tinyxml/ticpp.h>
+// Included by both filesystem and thread but still relatively small
+#include <boost/iterator/iterator_facade.hpp>
 
-// GCC may have problems with anonymous namespaces in certain situations
-#if !(defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 420))
-#  include "util/Convert.h"
-#endif
+#endif /* ORXONOX_COMPILER_MSVC */
+
+
+#include "util/Convert.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/Math.h"
+#include "util/mbool.h"
 #include "util/MultiType.h"
+#include "util/OrxAssert.h"
+#include "util/OrxEnum.h"
 #include "util/String.h"
 #include "util/SubString.h"
 
-// A change would trigger a 80% Core rebuild anyway
+
+#ifdef ORXONOX_COMPILER_MSVC
+
+// A change would trigger an 80% Core rebuild anyway
 #include "Identifier.h"
+
+#endif /*ORXONOX_COMPILER_MSVC */

code/branches/pch/src/network/CMakeLists.txt

@@ -42 +42 @@
   DEFINE_SYMBOL
     "NETWORK_SHARED_BUILD"
+  PCH_FILE
+    NetworkPrecompiledHeaders.h
   LINK_LIBRARIES
     ${ZLIB_LIBRARY}