fly/flightgear
1
0
Fork 0
Code Activity

Force use of PLIB joystick routines.

Browse source
This commit is contained in:
curt 1999-05-27 00:21:37 +00:00
parent bf56b15f7e
commit 1663d1628f
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Simulator/Joystick/Makefile.am
View file

@ -1,5 +1,5 @@
if ENABLE_LINUX_JOYSTICK if ENABLE_PLIB_JOYSTICK
DEFS += -DENABLE_LINUX_JOYSTICK DEFS += -DENABLE_PLIB_JOYSTICK
else else
DEFS += -DENABLE_GLUT_JOYSTICK DEFS += -DENABLE_GLUT_JOYSTICK
endif endif

11
Simulator/Joystick/joystick.cxx
View file

@ -32,7 +32,7 @@
#include <Aircraft/aircraft.hxx> #include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx> #include <Debug/logstream.hxx>
#if defined( ENABLE_LINUX_JOYSTICK ) #if defined( ENABLE_PLIB_JOYSTICK )
# include <plib/js.h> # include <plib/js.h>
#elif defined( ENABLE_GLUT_JOYSTICK ) #elif defined( ENABLE_GLUT_JOYSTICK )
# include <GL/glut.h> # include <GL/glut.h>
@ -43,7 +43,7 @@
#include "joystick.hxx" #include "joystick.hxx"
#if defined( ENABLE_LINUX_JOYSTICK ) #if defined( ENABLE_PLIB_JOYSTICK )
// joystick classes // joystick classes
static jsJoystick *js0; static jsJoystick *js0;
@ -119,7 +119,7 @@ int fgJoystickInit( void ) {
FG_LOG( FG_INPUT, FG_INFO, "Initializing joystick" ); FG_LOG( FG_INPUT, FG_INFO, "Initializing joystick" );
#if defined( ENABLE_LINUX_JOYSTICK ) #if defined( ENABLE_PLIB_JOYSTICK )
js0 = new jsJoystick ( 0 ); js0 = new jsJoystick ( 0 );
js1 = new jsJoystick ( 1 ); 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 // update the control parameters based on joystick intput
int fgJoystickRead( void ) { int fgJoystickRead( void ) {
@ -192,6 +192,5 @@ int fgJoystickRead( void ) {
return 1; return 1;
} }
#endif // ENABLE_LINUX_JOYSTICK #endif // ENABLE_PLIB_JOYSTICK

4
Simulator/Joystick/joystick.hxx
View file

@ -33,10 +33,10 @@
// Initialize the joystick(s) // Initialize the joystick(s)
int fgJoystickInit( void ); int fgJoystickInit( void );
#if defined( ENABLE_LINUX_JOYSTICK ) #if defined( ENABLE_PLIB_JOYSTICK )
// update the control parameters based on joystick intput // update the control parameters based on joystick intput
int fgJoystickRead( void ); int fgJoystickRead( void );
#endif // ENABLE_LINUX_JOYSTICK #endif // ENABLE_PLIB_JOYSTICK
#endif // _JOYSTICK_HXX #endif // _JOYSTICK_HXX