diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-26 06:14:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-26 06:14:58 +0300 |
| commit | 350a67ec8ceef31726e1bc298b921add6cea6df1 (patch) | |
| tree | a3eaf79f463de2fb44784d5221df7160eab28ff1 | |
| parent | 30edbd58ad1fb03358f6fb5251ed7106353bb82a (diff) | |
| download | mv-350a67ec8ceef31726e1bc298b921add6cea6df1.tar.gz mv-350a67ec8ceef31726e1bc298b921add6cea6df1.tar.bz2 mv-350a67ec8ceef31726e1bc298b921add6cea6df1.tar.xz mv-350a67ec8ceef31726e1bc298b921add6cea6df1.zip | |
Fix compilation with old SDL2 again.
| -rw-r--r-- | src/maingui.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sdlmusic.cpp | 5 | ||||
| -rw-r--r-- | src/utils/sdl2musichelper.cpp | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/maingui.cpp b/src/maingui.cpp index 62aac8604..71a5cd8d9 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -84,9 +84,11 @@ PRAGMA48(GCC diagnostic pop) #define SDL_IMAGE_VERSION_ATLEAST(X, Y, Z) \ (SDL_IMAGE_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) +#ifndef SDL_MIXER_COMPILEDVERSION #define SDL_MIXER_COMPILEDVERSION \ SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) +#endif // SDL_MIXER_COMPILEDVERSION #ifndef SDL_MIXER_VERSION_ATLEAST #define SDL_MIXER_VERSION_ATLEAST(X, Y, Z) \ diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp index 983fc55c2..9a2a4073b 100644 --- a/src/resources/sdlmusic.cpp +++ b/src/resources/sdlmusic.cpp @@ -25,6 +25,11 @@ #include "debug.h" #ifndef USE_SDL2 +#ifndef SDL_MIXER_COMPILEDVERSION +#define SDL_MIXER_COMPILEDVERSION \ + SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ + SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) +#endif // SDL_MIXER_COMPILEDVERSION #define SDL_MIXER_COMPILEDVERSION \ SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) diff --git a/src/utils/sdl2musichelper.cpp b/src/utils/sdl2musichelper.cpp index eb73b2214..14a017d31 100644 --- a/src/utils/sdl2musichelper.cpp +++ b/src/utils/sdl2musichelper.cpp @@ -24,6 +24,11 @@ #include "debug.h" +#ifndef SDL_MIXER_COMPILEDVERSION +#define SDL_MIXER_COMPILEDVERSION \ + SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, \ + SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) +#endif // SDL_MIXER_COMPILEDVERSION #ifndef SDL_MIXER_VERSION_ATLEAST #define SDL_MIXER_VERSION_ATLEAST(X, Y, Z) \ (SDL_MIXER_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) |