Changeset 2756 for code/trunk/src/orxonox

Timestamp:

Mar 8, 2009, 1:24:15 PM (16 years ago)

Author:

rgrieder

Message:

Minimising problems when including windows.h because it defines macros like "min" and "max" if not explicitly specified.
There are two headers we use that include windows.h: OgreWindowEventUtilities.h and enet.h. I had to tweak a little bit there as well.

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSGraphics.h (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• pch/havepch/OrxonoxStableHeaders.h (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSGraphics.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include <OgrePrerequisites.h>
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <OgreWindowEventUtilities.h>
 #include "core/GameState.h"

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -49 +49 @@
 #    define WIN32_LEAN_AND_MEAN
 #  endif
+#  define NOMINMAX // required to stop windows.h screwing up std::min definition
 #  include "windows.h"
-
-   //Get around Windows hackery
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
 #endif
 

code/trunk/src/orxonox/pch/havepch/OrxonoxStableHeaders.h

@@ -45 +45 @@
 #  define WIN32_LEAN_AND_MEAN
 #endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <Ogre.h>
 #include <CEGUI.h>
@@ -57 +58 @@
 #include <tinyxml/ticpp.h>
 #include <tolua++.h>
-
-//Get around Windows hackery (windows.h is included by Ogre.h)
-#ifdef ORXONOX_PLATFORM_WINDOWS 
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
-#endif
 
 //----------- Our files ----------