diff --git a/src/audio.cpp b/src/audio.cpp index 7af02e24..791d16d7 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -10,16 +10,16 @@ #include -#if defined USE_SDL_MIXER -# if defined HAVE_SDL_SDL_H -# include -# else -# include -# endif -# if defined HAVE_SDL_SDL_MIXER_H -# include +#if USE_SDL_MIXER +# if HAVE_SDL_SDL_H +# include +# include +# elif HAVE_SDL2_SDL_H +# include +# include # else -# include +# include +# include # endif #endif diff --git a/src/image/codec/sdl-image.cpp b/src/image/codec/sdl-image.cpp index 1df3a120..a731b2e4 100644 --- a/src/image/codec/sdl-image.cpp +++ b/src/image/codec/sdl-image.cpp @@ -12,16 +12,16 @@ #include -#if defined USE_SDL_IMAGE +#if USE_SDL_IMAGE -#if defined HAVE_SDL_SDL_H +#if HAVE_SDL_SDL_H # include -#else -# include -#endif -#if defined HAVE_SDL_SDL_IMAGE_H # include +#elif HAVE_SDL2_SDL_H +# include +# include #else +# include # include #endif @@ -121,5 +121,5 @@ SDL_Surface *SdlImageCodec::Create32BppSurface(ivec2 size) } /* namespace lol */ -#endif /* defined USE_SDL_IMAGE */ +#endif /* USE_SDL_IMAGE */ diff --git a/src/sample.cpp b/src/sample.cpp index 4ec87ff0..8276527e 100644 --- a/src/sample.cpp +++ b/src/sample.cpp @@ -16,16 +16,16 @@ #include #include -#if defined USE_SDL_MIXER -# if defined HAVE_SDL_SDL_H -# include -# else -# include -# endif -# if defined HAVE_SDL_SDL_MIXER_H -# include +#if USE_SDL_MIXER +# if HAVE_SDL_SDL_H +# include +# include +# elif HAVE_SDL2_SDL_H +# include +# include # else -# include +# include +# include # endif #endif