TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-03 02:45:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Follow SDL2 include path conventions

Browse Source 
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.
This commit is contained in:
Dmitry Marakasov 2017-02-08 13:19:04 +03:00
parent d8d91927bc
commit 24482d85f6
55 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDL2pp/AudioDevice.hh
View File

@ -25,8 +25,8 @@
#include <functional>
#include <string>
#include <SDL2/SDL_audio.h>
#include <SDL2/SDL_version.h>
#include <SDL_audio.h>
#include <SDL_version.h>
#include <SDL2pp/Optional.hh>
#include <SDL2pp/Config.hh>

2
SDL2pp/AudioSpec.hh
View File

@ -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>

2
SDL2pp/Chunk.hh
View File

@ -24,7 +24,7 @@
#include <string>
#include <SDL2/SDL_mixer.h>
#include <SDL_mixer.h>
#include <SDL2pp/Export.hh>

2
SDL2pp/Exception.cc
View File

@ -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>

2
SDL2pp/Font.cc
View File

@ -21,7 +21,7 @@
#include <vector>
#include <SDL2/SDL_ttf.h>
#include <SDL_ttf.h>
#include <SDL2pp/Font.hh>
#include <SDL2pp/RWops.hh>

2
SDL2pp/Font.hh
View File

@ -24,7 +24,7 @@
#include <string>
#include <SDL2/SDL_ttf.h>
#include <SDL_ttf.h>
#include <SDL2pp/Optional.hh>
#include <SDL2pp/Point.hh>

4
SDL2pp/Mixer.hh
View File

@ -25,8 +25,8 @@
#include <functional>
#include <memory>
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_mixer.h>
#include <SDL_stdinc.h>
#include <SDL_mixer.h>
#include <SDL2pp/Export.hh>

2
SDL2pp/Music.hh
View File

@ -24,7 +24,7 @@
#include <string>
#include <SDL2/SDL_mixer.h>
#include <SDL_mixer.h>
#include <SDL2pp/Export.hh>

2
SDL2pp/Point.hh
View File

@ -25,7 +25,7 @@
#include <iostream>
#include <functional>
#include <SDL2/SDL_rect.h>
#include <SDL_rect.h>
#include <SDL2pp/Export.hh>

2
SDL2pp/RWops.hh
View File

@ -24,7 +24,7 @@
#include <string>
#include <SDL2/SDL_rwops.h>
#include <SDL_rwops.h>
#include <SDL2pp/Exception.hh>
#include <SDL2pp/Export.hh>

2
SDL2pp/Rect.hh
View File

@ -24,7 +24,7 @@
#include <functional>
#include <SDL2/SDL_rect.h>
#include <SDL_rect.h>
#include <SDL2pp/Optional.hh>
#include <SDL2pp/Point.hh>

2
SDL2pp/Renderer.cc
View File

@ -21,7 +21,7 @@
#include <vector>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/Renderer.hh>
#include <SDL2pp/Window.hh>

4
SDL2pp/Renderer.hh
View File

@ -22,8 +22,8 @@
#ifndef SDL2PP_RENDERER_HH
#define SDL2PP_RENDERER_HH
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_blendmode.h>
#include <SDL_stdinc.h>
#include <SDL_blendmode.h>
#include <SDL2pp/Config.hh>
#include <SDL2pp/Optional.hh>

2
SDL2pp/SDL.cc
View File

@ -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>

2
SDL2pp/SDL.hh
View File

@ -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>

2
SDL2pp/SDLImage.cc
View File

@ -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>

2
SDL2pp/SDLMixer.cc
View File

@ -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>

2
SDL2pp/SDLTTF.cc
View File

@ -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>

4
SDL2pp/Surface.cc
View File

@ -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>

4
SDL2pp/Surface.hh
View File

@ -22,8 +22,8 @@
#ifndef SDL2PP_SURFACE_HH
#define SDL2PP_SURFACE_HH
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_blendmode.h>
#include <SDL_stdinc.h>
#include <SDL_blendmode.h>
#include <SDL2pp/Config.hh>
#include <SDL2pp/Optional.hh>

2
SDL2pp/SurfaceLock.cc
View File

@ -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>

4
SDL2pp/Texture.cc
View File

@ -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>

4
SDL2pp/Texture.hh
View File

@ -24,8 +24,8 @@
#include <string>
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_blendmode.h>
#include <SDL_stdinc.h>
#include <SDL_blendmode.h>
#include <SDL2pp/Optional.hh>
#include <SDL2pp/Rect.hh>

2
SDL2pp/TextureLock.cc
View File

@ -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>

2
SDL2pp/Window.cc
View File

@ -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>

6
SDL2pp/Window.hh
View File

@ -24,9 +24,9 @@
#include <string>
#include <SDL2/SDL_version.h>
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_video.h>
#include <SDL_version.h>
#include <SDL_stdinc.h>
#include <SDL_video.h>
#include <SDL2pp/Point.hh>
#include <SDL2pp/Export.hh>

2
cmake/FindSDL2.cmake
View File

@ -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)

2
cmake/FindSDL2_image.cmake
View File

@ -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)

2
cmake/FindSDL2_mixer.cmake
View File

@ -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)

2
cmake/FindSDL2_ttf.cmake
View File

@ -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)

2
examples/audio_sine.cc
View File

@ -22,7 +22,7 @@
#include <cmath>
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/AudioDevice.hh>

2
examples/audio_wav.cc
View File

@ -23,7 +23,7 @@
#include <stdexcept>
#include <algorithm>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/AudioDevice.hh>

4
examples/fill.cc
View File

@ -22,8 +22,8 @@
#include <iostream>
#include <cmath>
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include <SDL.h>
#include <SDL_image.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLImage.hh>

4
examples/image.cc
View File

@ -22,8 +22,8 @@
#include <cmath>
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include <SDL.h>
#include <SDL_image.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLImage.hh>

2
examples/lines.cc
View File

@ -21,7 +21,7 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/Window.hh>

4
examples/mixer.cc
View File

@ -21,8 +21,8 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL2/SDL_mixer.h>
#include <SDL.h>
#include <SDL_mixer.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLMixer.hh>

4
examples/mixer_effects.cc
View File

@ -21,8 +21,8 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL2/SDL_mixer.h>
#include <SDL.h>
#include <SDL_mixer.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLMixer.hh>

4
examples/mixer_music.cc
View File

@ -21,8 +21,8 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL2/SDL_mixer.h>
#include <SDL.h>
#include <SDL_mixer.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLMixer.hh>

2
examples/mixer_music_sine.cc
View File

@ -22,7 +22,7 @@
#include <cmath>
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/Mixer.hh>

2
examples/rendertarget.cc
View File

@ -21,7 +21,7 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/Window.hh>

2
examples/sprites.cc
View File

@ -21,7 +21,7 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/Window.hh>

2
examples/ttf.cc
View File

@ -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>

2
tests/header_test.cc.in
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <@HEADER@>
int main(int, char*[]) {

2
tests/live_audiodevice.cc
View File

@ -2,7 +2,7 @@
#include <algorithm>
#include <vector>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL2pp.hh>
#include "testing.h"

2
tests/live_mixer.cc
View File

@ -1,6 +1,6 @@
#include <vector>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL2pp.hh>
#include "testing.h"

4
tests/live_rendering.cc
View File

@ -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"

2
tests/live_window.cc
View File

@ -1,6 +1,6 @@
#include <ios>
#include <SDL2/SDL.h>
#include <SDL.h>
#include <SDL2pp/SDL2pp.hh>
#include "testing.h"

4
tests/test_error.cc
View File

@ -1,5 +1,5 @@
#include <SDL2/SDL_main.h>
#include <SDL2/SDL_error.h>
#include <SDL_main.h>
#include <SDL_error.h>
#include <SDL2pp/Exception.hh>

2
tests/test_font.cc
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/SDLTTF.hh>
#include <SDL2pp/Font.hh>

2
tests/test_optional.cc
View File

@ -1,6 +1,6 @@
#include <string>
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Optional.hh>

2
tests/test_pointrect.cc
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Point.hh>
#include <SDL2pp/Rect.hh>

2
tests/test_pointrect_constexpr.cc
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Point.hh>
#include <SDL2pp/Rect.hh>

2
tests/test_rwops.cc
View File

@ -1,6 +1,6 @@
#include <vector>
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Exception.hh>
#include <SDL2pp/ContainerRWops.hh>

2
tests/test_surface.cc
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Surface.hh>

2
tests/test_wav.cc
View File

@ -1,4 +1,4 @@
#include <SDL2/SDL_main.h>
#include <SDL_main.h>
#include <SDL2pp/Wav.hh>