ALL: Synced with ScummVM
This commit is contained in:
parent
d4b7b14c09
commit
2fadf2e466
77 changed files with 2030 additions and 1020 deletions
|
@ -36,8 +36,8 @@
|
|||
|
||||
#include "backends/saves/default/default-saves.h"
|
||||
|
||||
// Audio CD support was removed with SDL 1.3
|
||||
#if SDL_VERSION_ATLEAST(1, 3, 0)
|
||||
// Audio CD support was removed with SDL 2.0
|
||||
#if SDL_VERSION_ATLEAST(2, 0, 0)
|
||||
#include "backends/audiocd/default/default-audiocd.h"
|
||||
#else
|
||||
#include "backends/audiocd/sdl/sdl-audiocd.h"
|
||||
|
@ -194,8 +194,8 @@ void OSystem_SDL::initBackend() {
|
|||
#endif
|
||||
|
||||
if (_audiocdManager == 0) {
|
||||
// Audio CD support was removed with SDL 1.3
|
||||
#if SDL_VERSION_ATLEAST(1, 3, 0)
|
||||
// Audio CD support was removed with SDL 2.0
|
||||
#if SDL_VERSION_ATLEAST(2, 0, 0)
|
||||
_audiocdManager = new DefaultAudioCDManager();
|
||||
#else
|
||||
_audiocdManager = new SdlAudioCDManager();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue