ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump SDL requirement to SDL 2.0.

This commit is contained in:
Brandon Wright 2017-11-23 18:57:47 -06:00
parent ea9dc6307b
commit 2eaac353ba
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/configure.ac
View File

@ -48,31 +48,31 @@ AC_ARG_WITH(opengl,
[], [],
[with_opengl=yes]) [with_opengl=yes])
AC_ARG_WITH(joystick, AC_ARG_WITH(joystick,
[AS_HELP_STRING([--with(out)-joystick], [AS_HELP_STRING([--with(out)-joystick],
[Enable joystick support if available (default: with)])], [Enable joystick support if available (default: with)])],
[], [],
[with_joystick=yes]) [with_joystick=yes])
AC_ARG_WITH(xv, AC_ARG_WITH(xv,
[AS_HELP_STRING([--with(out)-xv], [AS_HELP_STRING([--with(out)-xv],
[Enable XVideo output on GTK (default: with)])], [Enable XVideo output on GTK (default: with)])],
[], [],
[with_xv=yes]) [with_xv=yes])
AC_ARG_WITH(xrandr, AC_ARG_WITH(xrandr,
[AS_HELP_STRING([--with(out)-xrandr], [AS_HELP_STRING([--with(out)-xrandr],
[Enable XRandR support on GTK (default: with)])], [Enable XRandR support on GTK (default: with)])],
[], [],
[with_xrandr=yes]) [with_xrandr=yes])
AC_ARG_WITH(portaudio, AC_ARG_WITH(portaudio,
[AS_HELP_STRING([--with(out)-portaudio], [AS_HELP_STRING([--with(out)-portaudio],
[Enable PortAudio sound driver support (default: with)])], [Enable PortAudio sound driver support (default: with)])],
[], [],
[with_portaudio=yes]) [with_portaudio=yes])
AC_ARG_WITH(oss, AC_ARG_WITH(oss,
[AS_HELP_STRING([--with(out)-oss], [AS_HELP_STRING([--with(out)-oss],
[Enable OSS sound driver support (default: with)])], [Enable OSS sound driver support (default: with)])],
[], [],
@ -90,7 +90,7 @@ AC_ARG_WITH(pulseaudio,
[], [],
[with_pulseaudio=yes]) [with_pulseaudio=yes])
AC_ARG_WITH(debugger, AC_ARG_WITH(debugger,
[AS_HELP_STRING([--with(out)-debugger], [AS_HELP_STRING([--with(out)-debugger],
[Enable debugger (default: without)])], [Enable debugger (default: without)])],
[], [],
@ -102,13 +102,13 @@ AC_ARG_WITH(sdd1-decomp,
[], [],
[with_sdd1_decomp=yes]) [with_sdd1_decomp=yes])
AC_ARG_WITH(hq2x, AC_ARG_WITH(hq2x,
[AS_HELP_STRING([--with(out)-hq2x], [AS_HELP_STRING([--with(out)-hq2x],
[Enable support for the HQ2x family of filters (default: with)])], [Enable support for the HQ2x family of filters (default: with)])],
[], [],
[with_hq2x=yes]) [with_hq2x=yes])
AC_ARG_WITH(xbrz, AC_ARG_WITH(xbrz,
[AS_HELP_STRING([--with(out)-xbrz], [AS_HELP_STRING([--with(out)-xbrz],
[Enable support for the xBRZ filter (default: with)])], [Enable support for the xBRZ filter (default: with)])],
[], [],
@ -120,7 +120,7 @@ AC_ARG_WITH(netplay,
[], [],
[with_netplay=yes]) [with_netplay=yes])
AC_ARG_WITH(jma-decomp, AC_ARG_WITH(jma-decomp,
[AS_HELP_STRING([--with(out)-jma-decomp], [AS_HELP_STRING([--with(out)-jma-decomp],
[Enable JMA archive decompression (default: with)])], [Enable JMA archive decompression (default: with)])],
[], [],
@ -214,18 +214,18 @@ GTKJOY=0
SDL_CFLAGS="" SDL_CFLAGS=""
SDL_LIBS="" SDL_LIBS=""
if test yes = "$with_joystick"; then if test yes = "$with_joystick"; then
PKG_CHECK_MODULES([SDL],[sdl],[ PKG_CHECK_MODULES([SDL],[sdl2],[
GTKJOY=yes GTKJOY=yes
CFLAGS="$CFLAGS -DUSE_JOYSTICK" CFLAGS="$CFLAGS -DUSE_JOYSTICK"
],[ ],[
AC_CHECK_PROG(SDLCONFIGFOUND,[sdl-config],yes,no) AC_CHECK_PROG(SDLCONFIGFOUND,[sdl2-config],yes,no)
if test yes = "$SDLCONFIGFOUND" ; then if test yes = "$SDLCONFIGFOUND" ; then
SDL_CFLAGS="-DUSE_JOYSTICK `sdl-config --cflags`" SDL_CFLAGS="-DUSE_JOYSTICK `sdl2-config --cflags`"
SDL_LIBS="`sdl-config --libs`" SDL_LIBS="`sdl2-config --libs`"
GTKJOY=yes GTKJOY=yes
else else
echo "Cannot find SDL. Disabling joystick support." echo "Cannot find SDL2. Disabling joystick support."
fi fi
]) ])
fi fi
@ -265,7 +265,7 @@ if test yes = "$with_oss" ; then
],[ ],[
echo "Cannot find OSS headers." echo "Cannot find OSS headers."
echo "--> Disabling OSS support" echo "--> Disabling OSS support"
]) ])
fi fi
ALSA=0 ALSA=0

2
gtk/src/gtk_control.cpp
View File

@ -389,7 +389,7 @@ void
S9xInitInputDevices (void) S9xInitInputDevices (void)
{ {
#ifdef USE_JOYSTICK #ifdef USE_JOYSTICK
SDL_Init (SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); SDL_Init (SDL_INIT_JOYSTICK);
for (int i = 0; ; i++) for (int i = 0; ; i++)
{ {