thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Allow building with current SDL 1.3hg

Browse source
This commit is contained in:
Bastien Bouclet 2011-06-02 10:03:01 +02:00
parent cb37f4517b
commit 872d672c33
5 changed files with 62 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backends/platform/sdl/sdl.cpp
View file

@ -34,7 +34,14 @@
#include "common/textconsole.h"
#include "backends/saves/default/default-saves.h"
// Audio CD support was removed with SDL 1.3
#if SDL_VERSION_ATLEAST(1, 3, 0)
#include "backends/audiocd/default/default-audiocd.h"
#else
#include "backends/audiocd/sdl/sdl-audiocd.h"
#endif
#include "backends/events/sdl/sdl-events.h"
#include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/timer/sdl/sdl-timer.h"
@ -182,8 +189,15 @@ void OSystem_SDL::initBackend() {
_mixerManager->init();
}
if (_audiocdManager == 0)
if (_audiocdManager == 0) {
// Audio CD support was removed with SDL 1.3
#if SDL_VERSION_ATLEAST(1, 3, 0)
_audiocdManager = new DefaultAudioCDManager();
#else
_audiocdManager = new SdlAudioCDManager();
#endif
}
// Setup a custom program icon.
setupIcon();