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 6a36f9d806f0d87cb75d7a4fe661a60cc300cac7..3804e8e9408c404ffb7a4ecb1fdcb487d7c21d8e 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -27,12 +27,26 @@
 #endif
 
 #include "input.hxx"
+
+#include <simgear/compiler.h>
+
 #include "FGMouseInput.hxx"
 #include "FGKeyboardInput.hxx"
 #include "FGJoystickInput.hxx"
 
 #ifdef WITH_EVENTINPUT
+#if defined( SG_WINDOWS )
+//to be developed
+//#include "FGDirectXEventInput.hxx"
+//#define INPUTEVENT_CLASS FGDirectXEventInput
+#elif defined ( SG_MAC )
+#include "FGMacOSXEventInput.hxx"
+#define INPUTEVENT_CLASS FGMacOSXEventInput
+#else
 #include "FGLinuxEventInput.hxx"
+#define INPUTEVENT_CLASS FGLinuxEventInput
+#endif
+
 #endif
 
 ////////////////////////////////////////////////////////////////////////
@@ -45,6 +59,9 @@ FGInput::FGInput ()
   set_subsystem( "input-mouse", new FGMouseInput() );
   set_subsystem( "input-keyboard", new FGKeyboardInput() );
   set_subsystem( "input-joystick", new FGJoystickInput() );
+#ifdef INPUTEVENT_CLASS
+  set_subsystem( "input-event", new INPUTEVENT_CLASS() );
+#endif
 }
 
 FGInput::~FGInput ()