fix overly verbose driver names - Linux will never compile an Amiga joystick driver; anything a Linux user puts in his INI is clearly for Linux.

This commit is contained in:
Glenn Maynard
2005-05-14 02:29:18 +00:00
parent 64d2c0a30c
commit ded31d82f4
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -26,10 +26,10 @@ void MakeInputHandlers(CString drivers, vector<InputHandler *> &Add)
if(!DriversToTry[i].CompareNoCase("DirectInput") ) Add.push_back(new InputHandler_DInput);
#endif
#ifdef USE_INPUT_HANDLER_LINUX_JOYSTICK
if(!DriversToTry[i].CompareNoCase("Linux_Joystick") ) Add.push_back(new InputHandler_Linux_Joystick);
if(!DriversToTry[i].CompareNoCase("Joystick") ) Add.push_back(new InputHandler_Linux_Joystick);
#endif
#ifdef USE_INPUT_HANDLER_LINUX_TTY
if(!DriversToTry[i].CompareNoCase("Linux_tty") ) Add.push_back(new InputHandler_Linux_tty);
if(!DriversToTry[i].CompareNoCase("tty") ) Add.push_back(new InputHandler_Linux_tty);
#endif
#ifdef USE_INPUT_HANDLER_MONKEY_KEYBOARD
if(!DriversToTry[i].CompareNoCase("MonkeyKeyboard") ) Add.push_back(new InputHandler_MonkeyKeyboard);
+2 -2
View File
@@ -14,11 +14,11 @@
#elif defined(HAVE_DIRECTX)
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
#elif defined(HAVE_X11) // Prefer X11 over SDL
#define DEFAULT_INPUT_DRIVER_LIST "X11,Linux_joystick"
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
#elif defined(HAVE_SDL)
#define DEFAULT_INPUT_DRIVER_LIST "SDL"
#elif defined(LINUX)
#define DEFAULT_INPUT_DRIVER_LIST "Linux_joystick,Linux_tty"
#define DEFAULT_INPUT_DRIVER_LIST "Joystick"
#else
#define DEFAULT_INPUT_DRIVER_LIST "Null"
#endif