Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 40964c28557d022fa48faafa4626ea50375f9fda..3804e8e9408c404ffb7a4ecb1fdcb487d7c21d8e 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -27,20 +27,21 @@
 #endif
 
 #include "input.hxx"
+
+#include <simgear/compiler.h>
+
 #include "FGMouseInput.hxx"
 #include "FGKeyboardInput.hxx"
 #include "FGJoystickInput.hxx"
 
 #ifdef WITH_EVENTINPUT
-#if defined( UL_WIN32 )
+#if defined( SG_WINDOWS )
 //to be developed
 //#include "FGDirectXEventInput.hxx"
 //#define INPUTEVENT_CLASS FGDirectXEventInput
-#elif defined ( UL_MAC_OSX )
-/*
- Currently not supported :-(
- */
-#undef INPUTEVENT_CLASS
+#elif defined ( SG_MAC )
+#include "FGMacOSXEventInput.hxx"
+#define INPUTEVENT_CLASS FGMacOSXEventInput
 #else
 #include "FGLinuxEventInput.hxx"
 #define INPUTEVENT_CLASS FGLinuxEventInput