From 350a67ec8ceef31726e1bc298b921add6cea6df1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 26 Oct 2017 06:14:58 +0300 Subject: Fix compilation with old SDL2 again. --- src/maingui.cpp | 2 ++ src/resources/sdlmusic.cpp | 5 +++++ src/utils/sdl2musichelper.cpp | 5 +++++ 3 files changed, 12 insertions(+) (limited to 'src') 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)) -- cgit v1.2.3-70-g09d2