Changeset 3212

Timestamp:

Jun 23, 2009, 3:45:04 PM (16 years ago)

Author:

rgrieder

Message:

Refined PCH files a bit.

Location:

code/branches/netp5/src

Files:

• core/Core.cc (modified) (1 diff)
• core/CorePrecompiledHeaders.h (modified) (2 diffs)
• orxonox/OrxonoxPrecompiledHeaders.h (modified) (2 diffs)
• util/Clipboard.cc (modified) (1 diff)
• util/Math.h (modified) (1 diff)
• util/Sleep.cc (modified) (1 diff)

code/branches/netp5/src/core/Core.cc

@@ -47 +47 @@
 #  endif
 #  include <windows.h>
+#  undef min
+#  undef max
 #elif defined(ORXONOX_PLATFORM_APPLE)
 #  include <sys/param.h>

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

@@ -35 +35 @@
 #include "CorePrereqs.h"
 
+#include <cassert>
 #include <fstream>
 #include <iostream>
 #include <list>
+#include <locale>
 #include <map>
+#include <queue>
 #include <set>
 #include <sstream>
+#include <stack>
 #include <string>
 #include <vector>
@@ -47 +51 @@
 #ifdef ORXONOX_COMPILER_MSVC
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <OgreMath.h>
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector4.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+
+#include <boost/shared_ptr.hpp> // 12
+#include <boost/preprocessor/cat.hpp> // 12
+// Included by both filesystem and thread but still relatively small
+#include <boost/iterator/iterator_facade.hpp> // 10
+
+// Just in case some header included windows.h
+#undef min
 #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>
 
 #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"
 

code/branches/netp5/src/orxonox/OrxonoxPrecompiledHeaders.h

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
+#include <cassert>
 #include <deque>
 #include <fstream>
@@ -84 +85 @@
 #include "util/Math.h"
 #include "util/OgreForwardRefs.h"
-#include "util/OrxAssert.h"
-#include "util/String.h"
 #include "util/SubString.h"
 

code/branches/netp5/src/util/Clipboard.cc

@@ -42 +42 @@
 /////////////
 
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#undef min
+#undef max
 #include "Debug.h"
 

code/branches/netp5/src/util/Math.h

@@ -47 +47 @@
 #include <OgreColourValue.h>
 
-// Certain headers might define min and max macros
-#if defined(max) || defined(min) || defined(sgn) || defined(clamp) || defined(square) || defined(mod)
-#  error An inline math function was overridden by a macro
-#endif
+// Certain headers might define unwanted macros...
+#undef max
+#undef min
+#undef sgn
+#undef clamp
+#undef sqrt
+#undef square
+#undef mod
+#undef rnd
 
 namespace orxonox

code/branches/netp5/src/util/Sleep.cc

@@ -37 +37 @@
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#undef min
+#undef max
 
 namespace orxonox