From: curt <curt>
Date: Thu, 27 May 1999 00:21:54 +0000 (+0000)
Subject: Use PLIB joystick routines for windows and linux.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cdbc9a9a5f8c19942ca62ca66c114ac8c77257a7;p=flightgear.git

Use PLIB joystick routines for windows and linux.
---

diff --git a/Simulator/Main/GLUTmain.cxx b/Simulator/Main/GLUTmain.cxx
index d69c8fb9a..5224c0c3e 100644
--- 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 fbd02e492..760021244 100644
--- 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