Changeset 3150 for code/branches/pch/src/core

Timestamp:

Jun 12, 2009, 10:58:40 AM (15 years ago)

Author:

rgrieder

Message:

Build fixes (X11 defines the None macro…)

Location:

code/branches/pch/src/core

Files:

• CommandLine.cc (modified) (1 diff)
• input/InputManager.cc (modified) (2 diffs)
• input/InputState.h (modified) (1 diff)

code/branches/pch/src/core/CommandLine.cc

@@ -30 +30 @@
 
 #include <boost/filesystem.hpp>
+
+#include "util/Exception.h"
 #include "util/String.h"
 #include "util/SubString.h"

code/branches/pch/src/core/input/InputManager.cc

@@ -41 +41 @@
 #include <ois/OISInputManager.h>
 
-// HACK
-#ifdef ORXONOX_PLATFORM_LINUX
-#  include <ois/linux/LinuxMouse.h>
-#endif
-
 #include "util/Exception.h"
 #include "util/Debug.h"
-#include "core/ConsoleCommand.h"
 #include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
 
@@ -60 +55 @@
 #include "ExtendedInputState.h"
 #include "JoyStickDeviceNumberListener.h"
+
+// HACK (include this as last, X11 seems to define some macros...)
+#ifdef ORXONOX_PLATFORM_LINUX
+#  include <ois/linux/LinuxMouse.h>
+#endif
 
 namespace orxonox

code/branches/pch/src/core/input/InputState.h

@@ -91 +91 @@
         InputState()
             : bHandlersChanged_(false)
+            , executorOnEnter_(0)
+            , executorOnLeave_(0)
             , priority_(0)
             , bAlwaysGetsInput_(false)
             , bTransparent_(false)
-            , executorOnEnter_(0)
-            , executorOnLeave_(0)
         { }
         virtual ~InputState() { }