Mercurial > sdl-ios-xcode
view test/configure.in @ 1748:5e86e34453d4
------- Comment #1 From Max Horn 2006-04-17 03:08 [reply] -------
Created an attachment (id=106) [edit]
Patch for src/joystick/win32/SDL_mmjoystick.c
I am not even a Windows user, so take the following with a grain of salt:
SDL_mmjoystick.c has a function GetJoystickName which obtains the joystick
name by looking at the registry. The way it does that seems very fishy to me.
Namely, it uses the parameter "index" to construct a registry value name (BTW,
those variables used in the code are really badly named). The value of "index"
in turn equals the current value of "numdevs", as called from
SDL_SYS_JoystickInit.
I read through the MSDN docs at
<http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dnarinput/html/msdn_extdirect.asp>,
and I believe the simple fix is to replace line 183 of said file
SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey);
by the following:
SYS_JoystickName[numdevs] = GetJoystickName(SYS_JoystickID[i],
joycaps.szRegKey);
However, that is only *hiding* the real issue. Problem is, the list of
joysticks as returned by windows may contains "gaps", and the code deals
incorrectly with that. Namely those gaps occur if joysticks are
removed/(re)added, as the reporter observed.
The attached patch fixes this and another (off-by-one) issue in the code. But
since I have no Windows machine, I can't even test-compile it, so use with
caution.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sat, 29 Apr 2006 20:22:31 +0000 |
parents | 31c2b8e4885e |
children | 0a53c90a37f9 a7cda692b681 |
line wrap: on
line source
dnl Process this file with autoconf to produce a configure script. AC_INIT(README) dnl Detect the canonical build and host environments AC_CONFIG_AUX_DIRS($srcdir/../build-scripts) AC_CANONICAL_HOST dnl Check for tools AC_PROG_CC dnl Check for compiler environment AC_C_CONST dnl Figure out which math library to use case "$host" in *-*-cygwin* | *-*-mingw32*) EXE=".exe" MATHLIB="" SYS_GL_LIBS="-lopengl32" ;; *-*-beos*) EXE="" MATHLIB="" SYS_GL_LIBS="-lGL" ;; *-*-darwin* ) EXE="" MATHLIB="" SYS_GL_LIBS="" ;; *-*-aix*) EXE="" if test x$ac_cv_prog_gcc = xyes; then CFLAGS="-mthreads" fi SYS_GL_LIBS="" ;; *-*-mint*) EXE="" MATHLIB="" AC_PATH_PROG(OSMESA_CONFIG, osmesa-config, no) if test "x$OSMESA_CONFIG" = "xyes"; then OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` OSMESA_LIBS=`$OSMESA_CONFIG --libs` CFLAGS="$CFLAGS $OSMESA_CFLAGS" SYS_GL_LIBS="$OSMESA_LIBS" else SYS_GL_LIBS="-lOSMesa" fi ;; *) EXE="" MATHLIB="-lm" SYS_GL_LIBS="-lGL" ;; esac AC_SUBST(EXE) AC_SUBST(MATHLIB) dnl Check for SDL SDL_VERSION=1.2.10 AM_PATH_SDL($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) ) CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" dnl Check for OpenGL AC_MSG_CHECKING(for OpenGL support) have_opengl=no AC_TRY_COMPILE([ #include "SDL_opengl.h" ],[ ],[ have_opengl=yes ]) AC_MSG_RESULT($have_opengl) if test x$have_opengl = xyes; then CFLAGS="$CFLAGS -DHAVE_OPENGL" GLLIB="$SYS_GL_LIBS" else GLLIB="" fi AC_SUBST(GLLIB) dnl Finally create all the generated files AC_OUTPUT([Makefile])