diff --git a/build/autotools/m4/lol-sdl.m4 b/build/autotools/m4/lol-sdl.m4 index 13d98915..0db6914f 100644 --- a/build/autotools/m4/lol-sdl.m4 +++ b/build/autotools/m4/lol-sdl.m4 @@ -37,7 +37,6 @@ dnl LOL_USE_SDL -- whether SDL v2 was found dnl LOL_USE_SDL_IMAGE -- whether SDL_image was found dnl LOL_USE_SDL_MIXER -- whether SDL_mixer was found dnl HAVE_SDL_H -- whether to include -dnl HAVE_SDL_SDL_H -- whether to include dnl HAVE_SDL2_SDL_H -- whether to include dnl Generated automake conditionals: dnl LOL_USE_SDL -- whether SDL v2 was found @@ -75,12 +74,12 @@ if test "x${ac_cv_my_have_sdl}" = xno; then save_LIBS="${LIBS}" CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}" LIBS="${LIBS} ${SDL_LIBS}" - AC_CHECK_HEADERS(SDL.h SDL/SDL.h SDL2/SDL.h, + AC_CHECK_HEADERS(SDL.h SDL2/SDL.h, [ac_cv_my_have_sdl="yes"]) if test "x${ac_cv_my_have_sdl}" != xno; then - AC_CHECK_HEADERS(SDL_mixer.h SDL/SDL_mixer.h SDL2/SDL_mixer.h, + AC_CHECK_HEADERS(SDL_mixer.h SDL2/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"]) - AC_CHECK_HEADERS(SDL_image.h SDL/SDL_image.h SDL2/SDL_image.h, + AC_CHECK_HEADERS(SDL_image.h SDL2/SDL_image.h, [ac_cv_my_have_sdl_image="yes"]) AC_CHECK_LIB(SDL2, main, [SDL_LIBS="${SDL_LIBS} -lSDL2"], diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index 1e1ce4db..dd209812 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -13,13 +13,10 @@ #include #if LOL_USE_SDL_MIXER -# if HAVE_SDL_SDL_H -# include -# include -# elif HAVE_SDL2_SDL_H +# if HAVE_SDL2_SDL_H # include # include -# else +# elif HAVE_SDL_H # include # include # endif diff --git a/src/audio/sample.cpp b/src/audio/sample.cpp index 2b42ac28..2c23a905 100644 --- a/src/audio/sample.cpp +++ b/src/audio/sample.cpp @@ -17,13 +17,10 @@ #include #if LOL_USE_SDL_MIXER -# if HAVE_SDL_SDL_H -# include -# include -# elif HAVE_SDL2_SDL_H +# if HAVE_SDL2_SDL_H # include # include -# else +# elif HAVE_SDL_H # include # include # endif diff --git a/src/eglapp.cpp b/src/eglapp.cpp index 74c8a587..edff7f1f 100644 --- a/src/eglapp.cpp +++ b/src/eglapp.cpp @@ -29,9 +29,7 @@ #if LOL_USE_SDL # if HAVE_SDL2_SDL_H # include -# elif HAVE_SDL_SDL_H -# include -# else +# elif HAVE_SDL_H # include # endif #endif diff --git a/src/image/codec/sdl-image.cpp b/src/image/codec/sdl-image.cpp index c37b7c69..ef3327aa 100644 --- a/src/image/codec/sdl-image.cpp +++ b/src/image/codec/sdl-image.cpp @@ -14,13 +14,10 @@ #if LOL_USE_SDL_IMAGE -#if HAVE_SDL_SDL_H -# include -# include -#elif HAVE_SDL2_SDL_H +#if HAVE_SDL2_SDL_H # include # include -#else +#elif HAVE_SDL_H # include # include #endif diff --git a/src/platform/sdl/sdlapp.cpp b/src/platform/sdl/sdlapp.cpp index 94fe34cc..204dbb2a 100644 --- a/src/platform/sdl/sdlapp.cpp +++ b/src/platform/sdl/sdlapp.cpp @@ -15,9 +15,7 @@ #if LOL_USE_SDL # if HAVE_SDL2_SDL_H # include -# elif HAVE_SDL_SDL_H -# include -# else +# elif HAVE_SDL_H # include # endif #endif diff --git a/src/platform/sdl/sdlinput.cpp b/src/platform/sdl/sdlinput.cpp index d2efa1e6..afe58b78 100644 --- a/src/platform/sdl/sdlinput.cpp +++ b/src/platform/sdl/sdlinput.cpp @@ -15,9 +15,7 @@ #if LOL_USE_SDL # if HAVE_SDL2_SDL_H # include -# elif HAVE_SDL_SDL_H -# include -# else +# elif HAVE_SDL_H # include # endif #endif