Date: Mon, 24 Sep 2007 17:54:58 +0200 SDL-1.2
authorRyan C. Gordon
Tue, 25 Sep 2007 09:59:26 +0000
branchSDL-1.2
changeset 4095f733c048a94f
parent 4094 ca992789c798
child 4096 1859647893b8
Date: Mon, 24 Sep 2007 17:54:58 +0200
From: Christopher GAUTIER <krys via.ecp.fr>
To: sdl@lists.libsdl.org
Subject: [SDL] SDL_INPUT_LINUXEV vs SDL_JOYSTICK_LINUXEVHello all,

There seems to be a slight inconsistency between the SDL_INPUT_LINUXEV
define (used in src/joystick/linux/), and SDL_JOYSTICK_LINUXEV defined
in include/SDL_config.h.

SDL_JOYSTICK_LINUXEV is never used, and SDL_INPUT_LINUXEV is not
mentioned in SDL_config.h.in (though set by the ./configure script).
This has the unfortunate effect of breaking the joystick detection on linux
boxes where /dev/input/event* is defined, but not /dev/(input/)?js*.

Trivial patch included.

Cheers.
include/SDL_config.h.in
     1.1 --- a/include/SDL_config.h.in	Sat Sep 01 17:25:24 2007 +0000
     1.2 +++ b/include/SDL_config.h.in	Tue Sep 25 09:59:26 2007 +0000
     1.3 @@ -201,13 +201,13 @@
     1.4  #undef SDL_CDROM_WIN32
     1.5  
     1.6  /* Enable various input drivers */
     1.7 +#undef SDL_INPUT_LINUXEV
     1.8  #undef SDL_INPUT_TSLIB
     1.9  #undef SDL_JOYSTICK_BEOS
    1.10  #undef SDL_JOYSTICK_DC
    1.11  #undef SDL_JOYSTICK_DUMMY
    1.12  #undef SDL_JOYSTICK_IOKIT
    1.13  #undef SDL_JOYSTICK_LINUX
    1.14 -#undef SDL_JOYSTICK_LINUXEV
    1.15  #undef SDL_JOYSTICK_MACOS
    1.16  #undef SDL_JOYSTICK_MINT
    1.17  #undef SDL_JOYSTICK_OS2