Use PLIB joystick routines for windows and linux.

diff --git a/Simulator/Main/GLUTmain.cxx b/Simulator/Main/GLUTmain.cxx
index d69c8fb9a0a30c774743e0423546e58950ed292d..5224c0c3e61ef1db38e619624ae0bb31e0c43885 100644 (file)
--- a/Simulator/Main/GLUTmain.cxx
+++ b/Simulator/Main/GLUTmain.cxx
@@ -479,7 +479,7 @@ static void fgMainLoop( void ) {
     FG_LOG( FG_ALL, FG_DEBUG, "Running Main Loop");
     FG_LOG( FG_ALL, FG_DEBUG, "======= ==== ====");
 
-#if defined( ENABLE_LINUX_JOYSTICK )
+#if defined( ENABLE_PLIB_JOYSTICK )
     // Read joystick and update control settings
     fgJoystickRead();
 #elif defined( ENABLE_GLUT_JOYSTICK )

diff --git a/Simulator/Main/Makefile.am b/Simulator/Main/Makefile.am
index fbd02e492b78b72f1c8b07f6152244353c2b3743..760021244e169625f7a0e027bb93a08c766eb7ed 100644 (file)
--- a/Simulator/Main/Makefile.am
+++ b/Simulator/Main/Makefile.am
@@ -11,8 +11,8 @@ if ENABLE_WIN32_AUDIO
 LIBS += -lwinmm
 endif
 
-if ENABLE_LINUX_JOYSTICK
-DEFS += -DENABLE_LINUX_JOYSTICK
+if ENABLE_PLIB_JOYSTICK
+DEFS += -DENABLE_PLIB_JOYSTICK
 else
 DEFS += -DENABLE_GLUT_JOYSTICK
 endif