Force use of PLIB joystick routines.

diff --git a/Simulator/Joystick/Makefile.am b/Simulator/Joystick/Makefile.am
index d5dd7e85d72599a9f878d55d3f380f470966d5d1..f2b2f78c9162e7a5d5e3006606c7e5cc07d43f6d 100644 (file)
--- a/Simulator/Joystick/Makefile.am
+++ b/Simulator/Joystick/Makefile.am
@@ -1,5 +1,5 @@
-if ENABLE_LINUX_JOYSTICK
-DEFS += -DENABLE_LINUX_JOYSTICK
+if ENABLE_PLIB_JOYSTICK
+DEFS += -DENABLE_PLIB_JOYSTICK
 else
 DEFS += -DENABLE_GLUT_JOYSTICK
 endif

diff --git a/Simulator/Joystick/joystick.cxx b/Simulator/Joystick/joystick.cxx
index 7e8f8dbe2876393fffc19be3420232cf0f1172b7..8031c9f92e017d9f09f3cb9b88925f81e7512da0 100644 (file)
--- a/Simulator/Joystick/joystick.cxx
+++ b/Simulator/Joystick/joystick.cxx
@@ -32,7 +32,7 @@
 #include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
 #  include <plib/js.h>
 #elif defined( ENABLE_GLUT_JOYSTICK )
 #  include <GL/glut.h>
@@ -43,7 +43,7 @@
 #include "joystick.hxx"
 
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
 
 // joystick classes
 static jsJoystick *js0;
@@ -119,7 +119,7 @@ int fgJoystickInit( void ) {
 
     FG_LOG( FG_INPUT, FG_INFO, "Initializing joystick" );
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
 
     js0 = new jsJoystick ( 0 );
     js1 = new jsJoystick ( 1 );
@@ -171,7 +171,7 @@ int fgJoystickInit( void ) {
 }
 
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
 
 // update the control parameters based on joystick intput
 int fgJoystickRead( void ) {
@@ -192,6 +192,5 @@ int fgJoystickRead( void ) {
     return 1;
 }
 
-#endif // ENABLE_LINUX_JOYSTICK
-
+#endif // ENABLE_PLIB_JOYSTICK
 

diff --git a/Simulator/Joystick/joystick.hxx b/Simulator/Joystick/joystick.hxx
index aa5e6f9a2c1d6e9b584ac6da872f8865c40c6e17..aa8e2e639f49217d775db70241fd96060ebd9c59 100644 (file)
--- a/Simulator/Joystick/joystick.hxx
+++ b/Simulator/Joystick/joystick.hxx
@@ -33,10 +33,10 @@
 // Initialize the joystick(s)
 int fgJoystickInit( void );
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
     // update the control parameters based on joystick intput
     int fgJoystickRead( void );
-#endif // ENABLE_LINUX_JOYSTICK
+#endif // ENABLE_PLIB_JOYSTICK
 
 
 #endif // _JOYSTICK_HXX