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

(SDL2) Use sdl_audio.c as audio driver

This commit is contained in:
Higor Eurípedes 2014-08-10 19:54:08 -03:00
parent e07dca3d22
commit f53b67aab7
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -214,7 +214,7 @@ ifeq ($(HAVE_SDL), 1)
endif endif
ifeq ($(HAVE_SDL2), 1) ifeq ($(HAVE_SDL2), 1)
OBJ += gfx/sdl2_gfx.o input/sdl2_input.o input/sdl2_joypad.o OBJ += gfx/sdl2_gfx.o input/sdl2_input.o input/sdl2_joypad.o audio/sdl_audio.o
JOYCONFIG_OBJ += input/sdl2_joypad.o JOYCONFIG_OBJ += input/sdl2_joypad.o
JOYCONFIG_LIBS += $(SDL2_LIBS) JOYCONFIG_LIBS += $(SDL2_LIBS)
DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC) DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC)

4
audio/sdl_audio.c
View File

@ -193,6 +193,10 @@ const audio_driver_t audio_sdl = {
sdl_audio_set_nonblock_state, sdl_audio_set_nonblock_state,
sdl_audio_free, sdl_audio_free,
NULL, NULL,
#ifdef HAVE_SDL2
"sdl2"
#else
"sdl" "sdl"
#endif
}; };

2
driver.c
View File

@ -69,7 +69,7 @@ static const audio_driver_t *audio_drivers[] = {
#ifdef HAVE_JACK #ifdef HAVE_JACK
&audio_jack, &audio_jack,
#endif #endif
#ifdef HAVE_SDL #if defined(HAVE_SDL) || defined(HAVE_SDL2)
&audio_sdl, &audio_sdl,
#endif #endif
#ifdef HAVE_XAUDIO #ifdef HAVE_XAUDIO