From 4c636123a4f9de3c529c704b45f858797d936481 Mon Sep 17 00:00:00 2001 From: Ronald Kinard Date: Thu, 20 Mar 2014 21:54:02 -0500 Subject: [PATCH] sdl2: Bump up mixer support to SDL2_mixxer --- src/sdl2/Makefile.cfg | 4 ++-- src/sdl2/mixer_sound.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sdl2/Makefile.cfg b/src/sdl2/Makefile.cfg index 68b80ac8..c62f90e9 100644 --- a/src/sdl2/Makefile.cfg +++ b/src/sdl2/Makefile.cfg @@ -105,7 +105,7 @@ ifdef NOMIXER else i_sound_o=$(OBJDIR)/mixer_sound.o OPTS+=-DHAVE_MIXER - SDL_LDFLAGS+=-lSDL_mixer + SDL_LDFLAGS+=-lSDL2_mixer endif ifdef SDL_TTF @@ -121,7 +121,7 @@ endif ifdef SDL_NET OPTS+=-DHAVE_SDLNET - SDL_LDFLAGS+=-lSDL_net + SDL_LDFLAGS+=-lSDL2_net endif ifdef SDLMAIN diff --git a/src/sdl2/mixer_sound.c b/src/sdl2/mixer_sound.c index 6888331d..658a8b5d 100644 --- a/src/sdl2/mixer_sound.c +++ b/src/sdl2/mixer_sound.c @@ -617,7 +617,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping) } #endif - music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len)); + music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE); if (!music) { CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError()); @@ -778,7 +778,7 @@ void I_SetMIDIMusicVolume(UINT8 volume) INT32 I_RegisterSong(void *data, size_t len) { - music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len)); + music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE); if (!music) { CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());