Changes to support GLUT joystick routines as fall back.

[flightgear.git] / Main / fg_init.cxx

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 2f26d080f655830a16191b81e4a98966a0c82323..8b91b21d13013f03a8bf3b040bccc49fb8874b3d 100644 (file)
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -50,11 +50,7 @@
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Debug/fg_debug.h>
-
-#ifdef ENABLE_JOYSTICK_SUPPORT
-#  include <Joystick/joystick.hxx>
-#endif
-
+#include <Joystick/joystick.hxx>
 #include <Math/fg_geodesy.hxx>
 #include <Math/fg_random.h>
 #include <Math/point3d.hxx>
@@ -349,14 +345,12 @@ int fgInitSubsystems( void )
              FG_Altitude * FEET_TO_METER);
     // end of thing that I just stuck in that I should probably move
 
-#ifdef ENABLE_JOYSTICK_SUPPORT
     // Joystick support
     if ( fgJoystickInit() ) {
        // Joystick initialized ok.
     } else {
        fgPrintf( FG_GENERAL, FG_ALERT, "Error in Joystick initialization!\n" );
     }
-#endif
 
     // Autopilot init added here, by Jeff Goeke-Smith
     fgAPInit(&current_aircraft);
@@ -368,6 +362,9 @@ int fgInitSubsystems( void )
 
 
 // $Log$
+// Revision 1.46  1998/10/27 02:14:38  curt
+// Changes to support GLUT joystick routines as fall back.
+//
 // Revision 1.45  1998/10/25 10:57:21  curt
 // Changes to use the new joystick library if it is available.
 //