diff options
author | Bastien Bouclet | 2011-06-02 10:03:01 +0200 |
---|---|---|
committer | Bastien Bouclet | 2011-06-22 19:44:46 +0200 |
commit | 872d672c335febce0c1d5dff3843b00c0016fce2 (patch) | |
tree | 97b3284ccdf4f6bf3b76df0ce96e85028cbe8985 /backends/platform/sdl/sdl.cpp | |
parent | cb37f4517baa4435c7cc0774d5a830173a6dc0db (diff) | |
download | scummvm-rg350-872d672c335febce0c1d5dff3843b00c0016fce2.tar.gz scummvm-rg350-872d672c335febce0c1d5dff3843b00c0016fce2.tar.bz2 scummvm-rg350-872d672c335febce0c1d5dff3843b00c0016fce2.zip |
SDL: Allow building with current SDL 1.3hg
Diffstat (limited to 'backends/platform/sdl/sdl.cpp')
-rw-r--r-- | backends/platform/sdl/sdl.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index ecaeabf4e1..7972b19689 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -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(); |