Changeset 2693 for code/branches/buildsystem3/src/orxonox/gamestates

Timestamp:

Feb 23, 2009, 9:37:35 PM (16 years ago)

Author:

rgrieder

Message:

Never change a running Microsoft system.

File:

• code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "GSRoot.h"
-
-#ifdef ORXONOX_PLATFORM_WINDOWS
-#  include <winbase.h>
-#endif
 
 #include "util/Exception.h"
@@ -49 +45 @@
 #include "objects/Tickable.h"
 
+#ifdef ORXONOX_PLATFORM_WINDOWS
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include "windows.h"
+
+   //Get around Windows hackery
+#  ifdef max
+#    undef max
+#  endif
+#  ifdef min
+#    undef min
+#  endif
+#endif
+
 namespace orxonox
 {