diff --git a/cmake/FindAudio.cmake b/cmake/FindAudio.cmake index 4411dc995..edb8276bf 100644 --- a/cmake/FindAudio.cmake +++ b/cmake/FindAudio.cmake @@ -113,11 +113,11 @@ if(Audio_TK STREQUAL "OpenAL") set(Audio_INCLUDE_DIRS ${Audio_INCLUDE_DIRS} ${Alut_INCLUDE_DIRS}) endif() elseif(Audio_TK STREQUAL "SDL_Mixer") - __FINDAUDIO_FINDSDLMIXER() - if(SDLMixer_FOUND) + find_package(SDL2Mixer) + if(SDL2Mixer_FOUND) set(Audio_FOUND TRUE) - set(Audio_LIBRARIES ${SDLMixer_LIBRARIES}) - set(Audio_INCLUDE_DIRS ${SDLMixer_INCLUDE_DIRS}) + set(Audio_LIBRARIES ${SDL2Mixer_LIBRARIES}) + set(Audio_INCLUDE_DIRS ${SDL2Mixer_INCLUDE_DIRS}) endif() elseif(Audio_TK STREQUAL "none") set(Audio_FOUND TRUE) diff --git a/src/platform/C4MusicFile.cpp b/src/platform/C4MusicFile.cpp index e1cb0534f..3ae3026b8 100644 --- a/src/platform/C4MusicFile.cpp +++ b/src/platform/C4MusicFile.cpp @@ -122,7 +122,7 @@ bool C4MusicFileSDL::Play(bool loop, double max_resume_time) return false; } // Mix_FreeMusic frees the RWop - Music = Mix_LoadMUS_RW(SDL_RWFromConstMem(Data, filesize)); + Music = Mix_LoadMUS_RW(SDL_RWFromConstMem(Data, filesize), 1); if (!Music) { LogF("SDL_mixer: %s", SDL_GetError());