Follow SDL2 include path conventions

Though these are broken and error prone, as they ignore the possibility of conflicts between SDL, SDL2 and wrappers thereof discarding useful include path prefix (SDL2/), since SDL and satellite libraries follow these it's too hard to stay away. So don't use prefixes for SDL include paths any longer.
2025-08-03 02:45:57 -04:00 · 2017-02-08 13:19:04 +03:00 · 2017-02-08 13:19:04 +03:00 · 24482d85f6
commit 24482d85f6
parent d8d91927bc
55 changed files with 71 additions and 71 deletions
--- a/SDL2pp/AudioDevice.hh
+++ b/SDL2pp/AudioDevice.hh
@ -25,8 +25,8 @@
 #include <functional>
 #include <string>
-#include <SDL2/SDL_audio.h>
+#include <SDL_audio.h>
-#include <SDL2/SDL_version.h>
+#include <SDL_version.h>
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Config.hh>
--- a/SDL2pp/AudioSpec.hh
+++ b/SDL2pp/AudioSpec.hh
@ -22,7 +22,7 @@
 #ifndef SDL2PP_AUDIOSPEC_HH
 #define SDL2PP_AUDIOSPEC_HH
-#include <SDL2/SDL_audio.h>
+#include <SDL_audio.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/Chunk.hh
+++ b/SDL2pp/Chunk.hh
@ -24,7 +24,7 @@
 #include <string>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/Exception.cc
+++ b/SDL2pp/Exception.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/Font.cc
+++ b/SDL2pp/Font.cc
@ -21,7 +21,7 @@
 #include <vector>
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 #include <SDL2pp/Font.hh>
 #include <SDL2pp/RWops.hh>
--- a/SDL2pp/Font.hh
+++ b/SDL2pp/Font.hh
@ -24,7 +24,7 @@
 #include <string>
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Point.hh>
--- a/SDL2pp/Mixer.hh
+++ b/SDL2pp/Mixer.hh
@ -25,8 +25,8 @@
 #include <functional>
 #include <memory>
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/Music.hh
+++ b/SDL2pp/Music.hh
@ -24,7 +24,7 @@
 #include <string>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/Point.hh
+++ b/SDL2pp/Point.hh
@ -25,7 +25,7 @@
 #include <iostream>
 #include <functional>
-#include <SDL2/SDL_rect.h>
+#include <SDL_rect.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/RWops.hh
+++ b/SDL2pp/RWops.hh
@ -24,7 +24,7 @@
 #include <string>
-#include <SDL2/SDL_rwops.h>
+#include <SDL_rwops.h>
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/Rect.hh
+++ b/SDL2pp/Rect.hh
@ -24,7 +24,7 @@
 #include <functional>
-#include <SDL2/SDL_rect.h>
+#include <SDL_rect.h>
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Point.hh>
--- a/SDL2pp/Renderer.cc
+++ b/SDL2pp/Renderer.cc
@ -21,7 +21,7 @@
 #include <vector>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/Renderer.hh>
 #include <SDL2pp/Window.hh>
--- a/SDL2pp/Renderer.hh
+++ b/SDL2pp/Renderer.hh
@ -22,8 +22,8 @@
 #ifndef SDL2PP_RENDERER_HH
 #define SDL2PP_RENDERER_HH
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_blendmode.h>
 #include <SDL2pp/Config.hh>
 #include <SDL2pp/Optional.hh>
--- a/SDL2pp/SDL.cc
+++ b/SDL2pp/SDL.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/SDL.hh
+++ b/SDL2pp/SDL.hh
@ -22,7 +22,7 @@
 #ifndef SDL2PP_SDL_HH
 #define SDL2PP_SDL_HH
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 #include <SDL2pp/Export.hh>
--- a/SDL2pp/SDLImage.cc
+++ b/SDL2pp/SDLImage.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL_image.h>
+#include <SDL_image.h>
 #include <SDL2pp/SDLImage.hh>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/SDLMixer.cc
+++ b/SDL2pp/SDLMixer.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/SDLMixer.hh>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/SDLTTF.cc
+++ b/SDL2pp/SDLTTF.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 #include <SDL2pp/SDLTTF.hh>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/Surface.cc
+++ b/SDL2pp/Surface.cc
@ -23,9 +23,9 @@
 #include <SDL2pp/Config.hh>
-#include <SDL2/SDL_surface.h>
+#include <SDL_surface.h>
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 #include <SDL2pp/Surface.hh>
--- a/SDL2pp/Surface.hh
+++ b/SDL2pp/Surface.hh
@ -22,8 +22,8 @@
 #ifndef SDL2PP_SURFACE_HH
 #define SDL2PP_SURFACE_HH
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_blendmode.h>
 #include <SDL2pp/Config.hh>
 #include <SDL2pp/Optional.hh>
--- a/SDL2pp/SurfaceLock.cc
+++ b/SDL2pp/SurfaceLock.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL_surface.h>
+#include <SDL_surface.h>
 #include <SDL2pp/Exception.hh>
--- a/SDL2pp/Texture.cc
+++ b/SDL2pp/Texture.cc
@ -24,9 +24,9 @@
 #include <SDL2pp/Config.hh>
-#include <SDL2/SDL_render.h>
+#include <SDL_render.h>
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 #include <SDL2pp/Texture.hh>
--- a/SDL2pp/Texture.hh
+++ b/SDL2pp/Texture.hh
@ -24,8 +24,8 @@
 #include <string>
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_blendmode.h>
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Rect.hh>
--- a/SDL2pp/TextureLock.cc
+++ b/SDL2pp/TextureLock.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL_render.h>
+#include <SDL_render.h>
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/Rect.hh>
--- a/SDL2pp/Window.cc
+++ b/SDL2pp/Window.cc
@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/Window.hh>
 #include <SDL2pp/Surface.hh>
--- a/SDL2pp/Window.hh
+++ b/SDL2pp/Window.hh
@ -24,9 +24,9 @@
 #include <string>
-#include <SDL2/SDL_version.h>
+#include <SDL_version.h>
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
-#include <SDL2/SDL_video.h>
+#include <SDL_video.h>
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Export.hh>
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@ -6,7 +6,7 @@
 #  SDL2_FOUND
 #
-FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL2/SDL.h)
+FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL.h PATH_SUFFIXES SDL2)
 FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2)
 FIND_LIBRARY(SDL2MAIN_LIBRARY NAMES SDL2main)
--- a/cmake/FindSDL2_image.cmake
+++ b/cmake/FindSDL2_image.cmake
@ -6,7 +6,7 @@
 #  SDL2_IMAGE_FOUND
 #
-FIND_PATH(SDL2_IMAGE_INCLUDE_DIR NAMES SDL2/SDL_image.h)
+FIND_PATH(SDL2_IMAGE_INCLUDE_DIR NAMES SDL_image.h PATH_SUFFIXES SDL2)
 FIND_LIBRARY(SDL2_IMAGE_LIBRARY NAMES SDL2_image)
--- a/cmake/FindSDL2_mixer.cmake
+++ b/cmake/FindSDL2_mixer.cmake
@ -6,7 +6,7 @@
 #  SDL2_MIXER_FOUND
 #
-FIND_PATH(SDL2_MIXER_INCLUDE_DIR NAMES SDL2/SDL_mixer.h)
+FIND_PATH(SDL2_MIXER_INCLUDE_DIR NAMES SDL_mixer.h PATH_SUFFIXES SDL2)
 FIND_LIBRARY(SDL2_MIXER_LIBRARY NAMES SDL2_mixer)
--- a/cmake/FindSDL2_ttf.cmake
+++ b/cmake/FindSDL2_ttf.cmake
@ -6,7 +6,7 @@
 #  SDL2_TTF_FOUND
 #
-FIND_PATH(SDL2_TTF_INCLUDE_DIR NAMES SDL2/SDL_ttf.h)
+FIND_PATH(SDL2_TTF_INCLUDE_DIR NAMES SDL_ttf.h PATH_SUFFIXES SDL2)
 FIND_LIBRARY(SDL2_TTF_LIBRARY NAMES SDL2_ttf)
--- a/examples/audio_sine.cc
+++ b/examples/audio_sine.cc
@ -22,7 +22,7 @@
 #include <cmath>
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/AudioDevice.hh>
--- a/examples/audio_wav.cc
+++ b/examples/audio_wav.cc
@ -23,7 +23,7 @@
 #include <stdexcept>
 #include <algorithm>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/AudioDevice.hh>
--- a/examples/fill.cc
+++ b/examples/fill.cc
@ -22,8 +22,8 @@
 #include <iostream>
 #include <cmath>
-#include <SDL2/SDL.h>
+#include <SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL_image.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLImage.hh>
--- a/examples/image.cc
+++ b/examples/image.cc
@ -22,8 +22,8 @@
 #include <cmath>
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL_image.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLImage.hh>
--- a/examples/lines.cc
+++ b/examples/lines.cc
@ -21,7 +21,7 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
--- a/examples/mixer.cc
+++ b/examples/mixer.cc
@ -21,8 +21,8 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
--- a/examples/mixer_effects.cc
+++ b/examples/mixer_effects.cc
@ -21,8 +21,8 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
--- a/examples/mixer_music.cc
+++ b/examples/mixer_music.cc
@ -21,8 +21,8 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
--- a/examples/mixer_music_sine.cc
+++ b/examples/mixer_music_sine.cc
@ -22,7 +22,7 @@
 #include <cmath>
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Mixer.hh>
--- a/examples/rendertarget.cc
+++ b/examples/rendertarget.cc
@ -21,7 +21,7 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
--- a/examples/sprites.cc
+++ b/examples/sprites.cc
@ -21,7 +21,7 @@
 #include <iostream>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
--- a/examples/ttf.cc
+++ b/examples/ttf.cc
@ -22,7 +22,7 @@
 #include <iostream>
 #include <vector>
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLTTF.hh>
--- a/tests/header_test.cc.in
+++ b/tests/header_test.cc.in
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <@HEADER@>
 int main(int, char*[]) {
--- a/tests/live_audiodevice.cc
+++ b/tests/live_audiodevice.cc
@ -2,7 +2,7 @@
 #include <algorithm>
 #include <vector>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 #include "testing.h"
--- a/tests/live_mixer.cc
+++ b/tests/live_mixer.cc
@ -1,6 +1,6 @@
 #include <vector>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 #include "testing.h"
--- a/tests/live_rendering.cc
+++ b/tests/live_rendering.cc
@ -1,10 +1,10 @@
 #include <vector>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 #include "testing.h"
--- a/tests/live_window.cc
+++ b/tests/live_window.cc
@ -1,6 +1,6 @@
 #include <ios>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 #include "testing.h"
--- a/tests/test_error.cc
+++ b/tests/test_error.cc
@ -1,5 +1,5 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
-#include <SDL2/SDL_error.h>
+#include <SDL_error.h>
 #include <SDL2pp/Exception.hh>
--- a/tests/test_font.cc
+++ b/tests/test_font.cc
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/SDLTTF.hh>
 #include <SDL2pp/Font.hh>
--- a/tests/test_optional.cc
+++ b/tests/test_optional.cc
@ -1,6 +1,6 @@
 #include <string>
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Optional.hh>
--- a/tests/test_pointrect.cc
+++ b/tests/test_pointrect.cc
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Rect.hh>
--- a/tests/test_pointrect_constexpr.cc
+++ b/tests/test_pointrect_constexpr.cc
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Rect.hh>
--- a/tests/test_rwops.cc
+++ b/tests/test_rwops.cc
@ -1,6 +1,6 @@
 #include <vector>
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/ContainerRWops.hh>
--- a/tests/test_surface.cc
+++ b/tests/test_surface.cc
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Surface.hh>
--- a/tests/test_wav.cc
+++ b/tests/test_wav.cc
@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <SDL2pp/Wav.hh>
`@ -1,4 +1,4 @@`
	`#include <SDL2/SDL_main.h>`	`#include <SDL_main.h>`

	`#include <SDL2pp/Surface.hh>`	`#include <SDL2pp/Surface.hh>`