diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-26 05:24:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-26 05:24:42 +0300 |
| commit | 30edbd58ad1fb03358f6fb5251ed7106353bb82a (patch) | |
| tree | e0b1fb4eada8b36809e82af310802441c2f6c8f5 | |
| parent | 3b601ac447ca958ffc556b545cf07cc7a277199e (diff) | |
| download | manaverse-30edbd58ad1fb03358f6fb5251ed7106353bb82a.tar.gz manaverse-30edbd58ad1fb03358f6fb5251ed7106353bb82a.tar.bz2 manaverse-30edbd58ad1fb03358f6fb5251ed7106353bb82a.tar.xz manaverse-30edbd58ad1fb03358f6fb5251ed7106353bb82a.zip | |
Fix compilation with old SDL 2 versions.
| -rw-r--r-- | src/maingui.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sdlmusic.cpp | 3 | ||||
| -rw-r--r-- | src/utils/sdl2musichelper.cpp | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/maingui.cpp b/src/maingui.cpp index f4d8d5f79..62aac8604 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -88,8 +88,10 @@ PRAGMA48(GCC diagnostic pop) SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) +#ifndef SDL_MIXER_VERSION_ATLEAST #define SDL_MIXER_VERSION_ATLEAST(X, Y, Z) \ (SDL_MIXER_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) +#endif // SDL_MIXER_VERSION_ATLEAST #include "debug.h" diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp index be363fc48..983fc55c2 100644 --- a/src/resources/sdlmusic.cpp +++ b/src/resources/sdlmusic.cpp @@ -28,9 +28,10 @@ #define SDL_MIXER_COMPILEDVERSION \ SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) - +#ifndef SDL_MIXER_VERSION_ATLEAST #define SDL_MIXER_VERSION_ATLEAST(X, Y, Z) \ (SDL_MIXER_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) +#endif // SDL_MIXER_VERSION_ATLEAST #endif // USE_SDL2 SDLMusic::SDLMusic(Mix_Music *const music, diff --git a/src/utils/sdl2musichelper.cpp b/src/utils/sdl2musichelper.cpp index 300f79991..eb73b2214 100644 --- a/src/utils/sdl2musichelper.cpp +++ b/src/utils/sdl2musichelper.cpp @@ -24,6 +24,11 @@ #include "debug.h" +#ifndef SDL_MIXER_VERSION_ATLEAST +#define SDL_MIXER_VERSION_ATLEAST(X, Y, Z) \ + (SDL_MIXER_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) +#endif // SDL_MIXER_VERSION_ATLEAST + int SDL::MixOpenAudio(const int frequency, const uint16_t format, const int nchannels, |