Changeset 1781 for code/trunk/src/orxonox/OrxonoxStableHeaders.h

Timestamp:

Sep 15, 2008, 12:42:18 AM (17 years ago)

Author:

rgrieder

Message:

• hack-fixed the colour of the radar dots.
• dealt with some M$ windows hackery (who would ever macro-define min/max???)

File:

• code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) && 0
 
 // including std headers here is useless since they're already precompiled
@@ -55 +55 @@
 #include "tinyxml/tinyxml.h"
 
+//Get around Windows hackery (windows.h is included by Ogre)
+#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 
+#  ifdef max
+#    undef max
+#  endif
+#  ifdef min
+#    undef min
+#  endif
+#endif
 
 //----------- Our files ----------