diff --git a/CMakeLists.txt b/CMakeLists.txt index fdf29f5..601d73b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ if(SFML_OS_WINDOWS) endif() # add the subdirectories -add_subdirectory(src/SFML) +add_subdirectory(src/CSFML) if(CSFML_BUILD_DOC) add_subdirectory(doc) endif() diff --git a/doc/doxyfile.in b/doc/doxyfile.in index ecfa536..5cf4158 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -966,7 +966,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = "@DOXYGEN_INPUT_DIR@/include/SFML" \ +INPUT = "@DOXYGEN_INPUT_DIR@/include/CSFML" \ "@DOXYGEN_INPUT_DIR@/doc/mainpage.hpp" # This tag can be used to specify the character encoding of the source files diff --git a/doc/mainpage.hpp b/doc/mainpage.hpp index 7428648..bf9e91a 100644 --- a/doc/mainpage.hpp +++ b/doc/mainpage.hpp @@ -12,8 +12,8 @@ /// /// \code /// -/// #include -/// #include +/// #include +/// #include /// /// int main() /// { diff --git a/examples/example.c b/examples/example.c index c694fa7..0432ca7 100644 --- a/examples/example.c +++ b/examples/example.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/include/SFML/Audio.h b/include/CSFML/Audio.h similarity index 79% rename from include/SFML/Audio.h rename to include/CSFML/Audio.h index 3ae7693..4797cf0 100644 --- a/include/SFML/Audio.h +++ b/include/CSFML/Audio.h @@ -28,12 +28,12 @@ // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/include/SFML/Audio/Export.h b/include/CSFML/Audio/Export.h similarity index 98% rename from include/SFML/Audio/Export.h rename to include/CSFML/Audio/Export.h index 3910301..7559d16 100644 --- a/include/SFML/Audio/Export.h +++ b/include/CSFML/Audio/Export.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/Listener.h b/include/CSFML/Audio/Listener.h similarity index 98% rename from include/SFML/Audio/Listener.h rename to include/CSFML/Audio/Listener.h index f8ea9ba..71bb474 100644 --- a/include/SFML/Audio/Listener.h +++ b/include/CSFML/Audio/Listener.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/Music.h b/include/CSFML/Audio/Music.h similarity index 98% rename from include/SFML/Audio/Music.h rename to include/CSFML/Audio/Music.h index d14f7b2..4eeae19 100644 --- a/include/SFML/Audio/Music.h +++ b/include/CSFML/Audio/Music.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Audio/Sound.h b/include/CSFML/Audio/Sound.h similarity index 98% rename from include/SFML/Audio/Sound.h rename to include/CSFML/Audio/Sound.h index 127c3f1..48adb98 100644 --- a/include/SFML/Audio/Sound.h +++ b/include/CSFML/Audio/Sound.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/SoundBuffer.h b/include/CSFML/Audio/SoundBuffer.h similarity index 97% rename from include/SFML/Audio/SoundBuffer.h rename to include/CSFML/Audio/SoundBuffer.h index 7c7384a..424c760 100644 --- a/include/SFML/Audio/SoundBuffer.h +++ b/include/CSFML/Audio/SoundBuffer.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Audio/SoundBufferRecorder.h b/include/CSFML/Audio/SoundBufferRecorder.h similarity index 98% rename from include/SFML/Audio/SoundBufferRecorder.h rename to include/CSFML/Audio/SoundBufferRecorder.h index 6fb6451..a0d62d4 100644 --- a/include/SFML/Audio/SoundBufferRecorder.h +++ b/include/CSFML/Audio/SoundBufferRecorder.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/SoundChannel.h b/include/CSFML/Audio/SoundChannel.h similarity index 100% rename from include/SFML/Audio/SoundChannel.h rename to include/CSFML/Audio/SoundChannel.h diff --git a/include/SFML/Audio/SoundRecorder.h b/include/CSFML/Audio/SoundRecorder.h similarity index 98% rename from include/SFML/Audio/SoundRecorder.h rename to include/CSFML/Audio/SoundRecorder.h index 0d1681c..b032607 100644 --- a/include/SFML/Audio/SoundRecorder.h +++ b/include/CSFML/Audio/SoundRecorder.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include diff --git a/include/SFML/Audio/SoundStatus.h b/include/CSFML/Audio/SoundStatus.h similarity index 98% rename from include/SFML/Audio/SoundStatus.h rename to include/CSFML/Audio/SoundStatus.h index 2fcd2c8..0557d68 100644 --- a/include/SFML/Audio/SoundStatus.h +++ b/include/CSFML/Audio/SoundStatus.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/SoundStream.h b/include/CSFML/Audio/SoundStream.h similarity index 98% rename from include/SFML/Audio/SoundStream.h rename to include/CSFML/Audio/SoundStream.h index ae31943..231610d 100644 --- a/include/SFML/Audio/SoundStream.h +++ b/include/CSFML/Audio/SoundStream.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Audio/Types.h b/include/CSFML/Audio/Types.h similarity index 100% rename from include/SFML/Audio/Types.h rename to include/CSFML/Audio/Types.h diff --git a/include/SFML/Config.h b/include/CSFML/Config.h similarity index 100% rename from include/SFML/Config.h rename to include/CSFML/Config.h diff --git a/include/SFML/GPUPreference.h b/include/CSFML/GPUPreference.h similarity index 98% rename from include/SFML/GPUPreference.h rename to include/CSFML/GPUPreference.h index e13a6e1..e7471b1 100644 --- a/include/SFML/GPUPreference.h +++ b/include/CSFML/GPUPreference.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// /// Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics.h b/include/CSFML/Graphics.h similarity index 56% rename from include/SFML/Graphics.h rename to include/CSFML/Graphics.h index fd8244b..b161561 100644 --- a/include/SFML/Graphics.h +++ b/include/CSFML/Graphics.h @@ -28,29 +28,29 @@ // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/include/SFML/Graphics/BlendMode.h b/include/CSFML/Graphics/BlendMode.h similarity index 99% rename from include/SFML/Graphics/BlendMode.h rename to include/CSFML/Graphics/BlendMode.h index 0b0801b..0cfbef8 100644 --- a/include/SFML/Graphics/BlendMode.h +++ b/include/CSFML/Graphics/BlendMode.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/CircleShape.h b/include/CSFML/Graphics/CircleShape.h similarity index 98% rename from include/SFML/Graphics/CircleShape.h rename to include/CSFML/Graphics/CircleShape.h index 3027956..d5f3fc0 100644 --- a/include/SFML/Graphics/CircleShape.h +++ b/include/CSFML/Graphics/CircleShape.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Color.h b/include/CSFML/Graphics/Color.h similarity index 99% rename from include/SFML/Graphics/Color.h rename to include/CSFML/Graphics/Color.h index 785b3f3..dd13fae 100644 --- a/include/SFML/Graphics/Color.h +++ b/include/CSFML/Graphics/Color.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/ConvexShape.h b/include/CSFML/Graphics/ConvexShape.h similarity index 98% rename from include/SFML/Graphics/ConvexShape.h rename to include/CSFML/Graphics/ConvexShape.h index b6a03ba..659768b 100644 --- a/include/SFML/Graphics/ConvexShape.h +++ b/include/CSFML/Graphics/ConvexShape.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Export.h b/include/CSFML/Graphics/Export.h similarity index 98% rename from include/SFML/Graphics/Export.h rename to include/CSFML/Graphics/Export.h index 956dc86..ef534fa 100644 --- a/include/SFML/Graphics/Export.h +++ b/include/CSFML/Graphics/Export.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Font.h b/include/CSFML/Graphics/Font.h similarity index 98% rename from include/SFML/Graphics/Font.h rename to include/CSFML/Graphics/Font.h index 2bc1436..bd6b6dd 100644 --- a/include/SFML/Graphics/Font.h +++ b/include/CSFML/Graphics/Font.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/FontInfo.h b/include/CSFML/Graphics/FontInfo.h similarity index 97% rename from include/SFML/Graphics/FontInfo.h rename to include/CSFML/Graphics/FontInfo.h index d90c272..933de7d 100644 --- a/include/SFML/Graphics/FontInfo.h +++ b/include/CSFML/Graphics/FontInfo.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// /// sfFontInfo holds various information about a font diff --git a/include/SFML/Graphics/Glsl.h b/include/CSFML/Graphics/Glsl.h similarity index 93% rename from include/SFML/Graphics/Glsl.h rename to include/CSFML/Graphics/Glsl.h index eee3c32..a9a15ba 100644 --- a/include/SFML/Graphics/Glsl.h +++ b/include/CSFML/Graphics/Glsl.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include // 2D vectors typedef sfVector2f sfGlslVec2; diff --git a/include/SFML/Graphics/Glyph.h b/include/CSFML/Graphics/Glyph.h similarity index 98% rename from include/SFML/Graphics/Glyph.h rename to include/CSFML/Graphics/Glyph.h index f2e676f..fdfa50a 100644 --- a/include/SFML/Graphics/Glyph.h +++ b/include/CSFML/Graphics/Glyph.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Image.h b/include/CSFML/Graphics/Image.h similarity index 97% rename from include/SFML/Graphics/Image.h rename to include/CSFML/Graphics/Image.h index 49ece6f..aa9476f 100644 --- a/include/SFML/Graphics/Image.h +++ b/include/CSFML/Graphics/Image.h @@ -27,13 +27,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/PrimitiveType.h b/include/CSFML/Graphics/PrimitiveType.h similarity index 98% rename from include/SFML/Graphics/PrimitiveType.h rename to include/CSFML/Graphics/PrimitiveType.h index 144c68c..936116f 100644 --- a/include/SFML/Graphics/PrimitiveType.h +++ b/include/CSFML/Graphics/PrimitiveType.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Rect.h b/include/CSFML/Graphics/Rect.h similarity index 97% rename from include/SFML/Graphics/Rect.h rename to include/CSFML/Graphics/Rect.h index e758dad..de68924 100644 --- a/include/SFML/Graphics/Rect.h +++ b/include/CSFML/Graphics/Rect.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/RectangleShape.h b/include/CSFML/Graphics/RectangleShape.h similarity index 98% rename from include/SFML/Graphics/RectangleShape.h rename to include/CSFML/Graphics/RectangleShape.h index 6a18bdc..35b11df 100644 --- a/include/SFML/Graphics/RectangleShape.h +++ b/include/CSFML/Graphics/RectangleShape.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/RenderStates.h b/include/CSFML/Graphics/RenderStates.h similarity index 92% rename from include/SFML/Graphics/RenderStates.h rename to include/CSFML/Graphics/RenderStates.h index 6465d31..b47c061 100644 --- a/include/SFML/Graphics/RenderStates.h +++ b/include/CSFML/Graphics/RenderStates.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/RenderTexture.h b/include/CSFML/Graphics/RenderTexture.h similarity index 98% rename from include/SFML/Graphics/RenderTexture.h rename to include/CSFML/Graphics/RenderTexture.h index 18802af..786e88c 100644 --- a/include/SFML/Graphics/RenderTexture.h +++ b/include/CSFML/Graphics/RenderTexture.h @@ -27,15 +27,15 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/RenderWindow.h b/include/CSFML/Graphics/RenderWindow.h similarity index 98% rename from include/SFML/Graphics/RenderWindow.h rename to include/CSFML/Graphics/RenderWindow.h index 1f34e47..542a4e5 100644 --- a/include/SFML/Graphics/RenderWindow.h +++ b/include/CSFML/Graphics/RenderWindow.h @@ -27,18 +27,18 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Shader.h b/include/CSFML/Graphics/Shader.h similarity index 98% rename from include/SFML/Graphics/Shader.h rename to include/CSFML/Graphics/Shader.h index 92758fb..b46586c 100644 --- a/include/SFML/Graphics/Shader.h +++ b/include/CSFML/Graphics/Shader.h @@ -27,14 +27,14 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Shape.h b/include/CSFML/Graphics/Shape.h similarity index 98% rename from include/SFML/Graphics/Shape.h rename to include/CSFML/Graphics/Shape.h index 41d4859..153bbc1 100644 --- a/include/SFML/Graphics/Shape.h +++ b/include/CSFML/Graphics/Shape.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Sprite.h b/include/CSFML/Graphics/Sprite.h similarity index 98% rename from include/SFML/Graphics/Sprite.h rename to include/CSFML/Graphics/Sprite.h index aa05305..947e615 100644 --- a/include/SFML/Graphics/Sprite.h +++ b/include/CSFML/Graphics/Sprite.h @@ -27,13 +27,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Text.h b/include/CSFML/Graphics/Text.h similarity index 98% rename from include/SFML/Graphics/Text.h rename to include/CSFML/Graphics/Text.h index fcfa8a9..845ceed 100644 --- a/include/SFML/Graphics/Text.h +++ b/include/CSFML/Graphics/Text.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/Texture.h b/include/CSFML/Graphics/Texture.h similarity index 98% rename from include/SFML/Graphics/Texture.h rename to include/CSFML/Graphics/Texture.h index 7e33a27..232c1f6 100644 --- a/include/SFML/Graphics/Texture.h +++ b/include/CSFML/Graphics/Texture.h @@ -27,12 +27,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Transform.h b/include/CSFML/Graphics/Transform.h similarity index 98% rename from include/SFML/Graphics/Transform.h rename to include/CSFML/Graphics/Transform.h index 4f429c3..da89d85 100644 --- a/include/SFML/Graphics/Transform.h +++ b/include/CSFML/Graphics/Transform.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/include/SFML/Graphics/Transformable.h b/include/CSFML/Graphics/Transformable.h similarity index 98% rename from include/SFML/Graphics/Transformable.h rename to include/CSFML/Graphics/Transformable.h index 70c7004..b39f74a 100644 --- a/include/SFML/Graphics/Transformable.h +++ b/include/CSFML/Graphics/Transformable.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Types.h b/include/CSFML/Graphics/Types.h similarity index 100% rename from include/SFML/Graphics/Types.h rename to include/CSFML/Graphics/Types.h diff --git a/include/SFML/Graphics/Vertex.h b/include/CSFML/Graphics/Vertex.h similarity index 94% rename from include/SFML/Graphics/Vertex.h rename to include/CSFML/Graphics/Vertex.h index f44ae73..5053dd2 100644 --- a/include/SFML/Graphics/Vertex.h +++ b/include/CSFML/Graphics/Vertex.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/VertexArray.h b/include/CSFML/Graphics/VertexArray.h similarity index 97% rename from include/SFML/Graphics/VertexArray.h rename to include/CSFML/Graphics/VertexArray.h index a960711..a1e89fe 100644 --- a/include/SFML/Graphics/VertexArray.h +++ b/include/CSFML/Graphics/VertexArray.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/VertexBuffer.h b/include/CSFML/Graphics/VertexBuffer.h similarity index 98% rename from include/SFML/Graphics/VertexBuffer.h rename to include/CSFML/Graphics/VertexBuffer.h index 57560db..e8606d1 100644 --- a/include/SFML/Graphics/VertexBuffer.h +++ b/include/CSFML/Graphics/VertexBuffer.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/include/SFML/Graphics/View.h b/include/CSFML/Graphics/View.h similarity index 98% rename from include/SFML/Graphics/View.h rename to include/CSFML/Graphics/View.h index 26dfced..27d4dd4 100644 --- a/include/SFML/Graphics/View.h +++ b/include/CSFML/Graphics/View.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network.h b/include/CSFML/Network.h similarity index 77% rename from include/SFML/Network.h rename to include/CSFML/Network.h index ecc4f24..ed9be23 100644 --- a/include/SFML/Network.h +++ b/include/CSFML/Network.h @@ -28,13 +28,13 @@ // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/include/SFML/Network/Export.h b/include/CSFML/Network/Export.h similarity index 98% rename from include/SFML/Network/Export.h rename to include/CSFML/Network/Export.h index 1d4fc70..8617eb9 100644 --- a/include/SFML/Network/Export.h +++ b/include/CSFML/Network/Export.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/Ftp.h b/include/CSFML/Network/Ftp.h similarity index 99% rename from include/SFML/Network/Ftp.h rename to include/CSFML/Network/Ftp.h index a043b8c..9697dfd 100644 --- a/include/SFML/Network/Ftp.h +++ b/include/CSFML/Network/Ftp.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include diff --git a/include/SFML/Network/Http.h b/include/CSFML/Network/Http.h similarity index 99% rename from include/SFML/Network/Http.h rename to include/CSFML/Network/Http.h index c8ba80e..48aa3d3 100644 --- a/include/SFML/Network/Http.h +++ b/include/CSFML/Network/Http.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/IpAddress.h b/include/CSFML/Network/IpAddress.h similarity index 99% rename from include/SFML/Network/IpAddress.h rename to include/CSFML/Network/IpAddress.h index 06ac6f5..60905e5 100644 --- a/include/SFML/Network/IpAddress.h +++ b/include/CSFML/Network/IpAddress.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/Packet.h b/include/CSFML/Network/Packet.h similarity index 99% rename from include/SFML/Network/Packet.h rename to include/CSFML/Network/Packet.h index 557e021..dd2a33d 100644 --- a/include/SFML/Network/Packet.h +++ b/include/CSFML/Network/Packet.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include diff --git a/include/SFML/Network/SocketSelector.h b/include/CSFML/Network/SocketSelector.h similarity index 98% rename from include/SFML/Network/SocketSelector.h rename to include/CSFML/Network/SocketSelector.h index 8935d2a..9f023fb 100644 --- a/include/SFML/Network/SocketSelector.h +++ b/include/CSFML/Network/SocketSelector.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/SocketStatus.h b/include/CSFML/Network/SocketStatus.h similarity index 100% rename from include/SFML/Network/SocketStatus.h rename to include/CSFML/Network/SocketStatus.h diff --git a/include/SFML/Network/TcpListener.h b/include/CSFML/Network/TcpListener.h similarity index 97% rename from include/SFML/Network/TcpListener.h rename to include/CSFML/Network/TcpListener.h index 7218b46..442bdc1 100644 --- a/include/SFML/Network/TcpListener.h +++ b/include/CSFML/Network/TcpListener.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/TcpSocket.h b/include/CSFML/Network/TcpSocket.h similarity index 98% rename from include/SFML/Network/TcpSocket.h rename to include/CSFML/Network/TcpSocket.h index e6ae3e4..9b80306 100644 --- a/include/SFML/Network/TcpSocket.h +++ b/include/CSFML/Network/TcpSocket.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/include/SFML/Network/Types.h b/include/CSFML/Network/Types.h similarity index 100% rename from include/SFML/Network/Types.h rename to include/CSFML/Network/Types.h diff --git a/include/SFML/Network/UdpSocket.h b/include/CSFML/Network/UdpSocket.h similarity index 98% rename from include/SFML/Network/UdpSocket.h rename to include/CSFML/Network/UdpSocket.h index 77ad986..60b2e02 100644 --- a/include/SFML/Network/UdpSocket.h +++ b/include/CSFML/Network/UdpSocket.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/include/SFML/OpenGL.h b/include/CSFML/OpenGL.h similarity index 98% rename from include/SFML/OpenGL.h rename to include/CSFML/OpenGL.h index 4763c55..65410c0 100644 --- a/include/SFML/OpenGL.h +++ b/include/CSFML/OpenGL.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System.h b/include/CSFML/System.h similarity index 82% rename from include/SFML/System.h rename to include/CSFML/System.h index d2b0776..3eac617 100644 --- a/include/SFML/System.h +++ b/include/CSFML/System.h @@ -28,11 +28,11 @@ // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/include/SFML/System/Alloc.h b/include/CSFML/System/Alloc.h similarity index 98% rename from include/SFML/System/Alloc.h rename to include/CSFML/System/Alloc.h index b243a2f..720eccb 100644 --- a/include/SFML/System/Alloc.h +++ b/include/CSFML/System/Alloc.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Buffer.h b/include/CSFML/System/Buffer.h similarity index 97% rename from include/SFML/System/Buffer.h rename to include/CSFML/System/Buffer.h index 05fa0ed..8d7f319 100644 --- a/include/SFML/System/Buffer.h +++ b/include/CSFML/System/Buffer.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include diff --git a/include/SFML/System/Clock.h b/include/CSFML/System/Clock.h similarity index 96% rename from include/SFML/System/Clock.h rename to include/CSFML/System/Clock.h index dded742..f5a53f8 100644 --- a/include/SFML/System/Clock.h +++ b/include/CSFML/System/Clock.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Export.h b/include/CSFML/System/Export.h similarity index 98% rename from include/SFML/System/Export.h rename to include/CSFML/System/Export.h index 0a8f1a6..efbadaf 100644 --- a/include/SFML/System/Export.h +++ b/include/CSFML/System/Export.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/InputStream.h b/include/CSFML/System/InputStream.h similarity index 98% rename from include/SFML/System/InputStream.h rename to include/CSFML/System/InputStream.h index 5e7b7b7..a3f3eb9 100644 --- a/include/SFML/System/InputStream.h +++ b/include/CSFML/System/InputStream.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/include/SFML/System/Sleep.h b/include/CSFML/System/Sleep.h similarity index 96% rename from include/SFML/System/Sleep.h rename to include/CSFML/System/Sleep.h index ef9b193..6573aec 100644 --- a/include/SFML/System/Sleep.h +++ b/include/CSFML/System/Sleep.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Time.h b/include/CSFML/System/Time.h similarity index 99% rename from include/SFML/System/Time.h rename to include/CSFML/System/Time.h index 83df4aa..5021349 100644 --- a/include/SFML/System/Time.h +++ b/include/CSFML/System/Time.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Types.h b/include/CSFML/System/Types.h similarity index 100% rename from include/SFML/System/Types.h rename to include/CSFML/System/Types.h diff --git a/include/SFML/System/Vector2.h b/include/CSFML/System/Vector2.h similarity index 98% rename from include/SFML/System/Vector2.h rename to include/CSFML/System/Vector2.h index 864ded3..9a4d02e 100644 --- a/include/SFML/System/Vector2.h +++ b/include/CSFML/System/Vector2.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Vector3.h b/include/CSFML/System/Vector3.h similarity index 97% rename from include/SFML/System/Vector3.h rename to include/CSFML/System/Vector3.h index 92f0bdf..9442b3d 100644 --- a/include/SFML/System/Vector3.h +++ b/include/CSFML/System/Vector3.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window.h b/include/CSFML/Window.h similarity index 73% rename from include/SFML/Window.h rename to include/CSFML/Window.h index b7fa07a..7f0a8f5 100644 --- a/include/SFML/Window.h +++ b/include/CSFML/Window.h @@ -28,16 +28,16 @@ // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/include/SFML/Window/Clipboard.h b/include/CSFML/Window/Clipboard.h similarity index 97% rename from include/SFML/Window/Clipboard.h rename to include/CSFML/Window/Clipboard.h index d02c157..b8ce3d1 100644 --- a/include/SFML/Window/Clipboard.h +++ b/include/CSFML/Window/Clipboard.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Context.h b/include/CSFML/Window/Context.h similarity index 97% rename from include/SFML/Window/Context.h rename to include/CSFML/Window/Context.h index fe45cd5..31bac5d 100644 --- a/include/SFML/Window/Context.h +++ b/include/CSFML/Window/Context.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include typedef void (*GlFunctionPointer)(void); diff --git a/include/SFML/Window/Cursor.h b/include/CSFML/Window/Cursor.h similarity index 98% rename from include/SFML/Window/Cursor.h rename to include/CSFML/Window/Cursor.h index accd335..4f62cfa 100644 --- a/include/SFML/Window/Cursor.h +++ b/include/CSFML/Window/Cursor.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Event.h b/include/CSFML/Window/Event.h similarity index 97% rename from include/SFML/Window/Event.h rename to include/CSFML/Window/Event.h index 6707832..0d2f73b 100644 --- a/include/SFML/Window/Event.h +++ b/include/CSFML/Window/Event.h @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Export.h b/include/CSFML/Window/Export.h similarity index 98% rename from include/SFML/Window/Export.h rename to include/CSFML/Window/Export.h index 8dd4656..b994508 100644 --- a/include/SFML/Window/Export.h +++ b/include/CSFML/Window/Export.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Joystick.h b/include/CSFML/Window/Joystick.h similarity index 98% rename from include/SFML/Window/Joystick.h rename to include/CSFML/Window/Joystick.h index 922ac3c..675af87 100644 --- a/include/SFML/Window/Joystick.h +++ b/include/CSFML/Window/Joystick.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/JoystickIdentification.h b/include/CSFML/Window/JoystickIdentification.h similarity index 97% rename from include/SFML/Window/JoystickIdentification.h rename to include/CSFML/Window/JoystickIdentification.h index 109b42b..fe06d35 100644 --- a/include/SFML/Window/JoystickIdentification.h +++ b/include/CSFML/Window/JoystickIdentification.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Keyboard.h b/include/CSFML/Window/Keyboard.h similarity index 99% rename from include/SFML/Window/Keyboard.h rename to include/CSFML/Window/Keyboard.h index b81e772..520e3e7 100644 --- a/include/SFML/Window/Keyboard.h +++ b/include/CSFML/Window/Keyboard.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Mouse.h b/include/CSFML/Window/Mouse.h similarity index 97% rename from include/SFML/Window/Mouse.h rename to include/CSFML/Window/Mouse.h index 246d68f..972f460 100644 --- a/include/SFML/Window/Mouse.h +++ b/include/CSFML/Window/Mouse.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Sensor.h b/include/CSFML/Window/Sensor.h similarity index 97% rename from include/SFML/Window/Sensor.h rename to include/CSFML/Window/Sensor.h index cba8a2e..da5ef30 100644 --- a/include/SFML/Window/Sensor.h +++ b/include/CSFML/Window/Sensor.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Touch.h b/include/CSFML/Window/Touch.h similarity index 96% rename from include/SFML/Window/Touch.h rename to include/CSFML/Window/Touch.h index d740390..d4ef4a9 100644 --- a/include/SFML/Window/Touch.h +++ b/include/CSFML/Window/Touch.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Types.h b/include/CSFML/Window/Types.h similarity index 100% rename from include/SFML/Window/Types.h rename to include/CSFML/Window/Types.h diff --git a/include/SFML/Window/VideoMode.h b/include/CSFML/Window/VideoMode.h similarity index 99% rename from include/SFML/Window/VideoMode.h rename to include/CSFML/Window/VideoMode.h index 40a5a03..6a0bbc6 100644 --- a/include/SFML/Window/VideoMode.h +++ b/include/CSFML/Window/VideoMode.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/include/SFML/Window/Vulkan.h b/include/CSFML/Window/Vulkan.h similarity index 98% rename from include/SFML/Window/Vulkan.h rename to include/CSFML/Window/Vulkan.h index bd26dad..16ad278 100644 --- a/include/SFML/Window/Vulkan.h +++ b/include/CSFML/Window/Vulkan.h @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/include/SFML/Window/Window.h b/include/CSFML/Window/Window.h similarity index 98% rename from include/SFML/Window/Window.h rename to include/CSFML/Window/Window.h index d2ae8a1..bade4ee 100644 --- a/include/SFML/Window/Window.h +++ b/include/CSFML/Window/Window.h @@ -27,13 +27,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/WindowBase.h b/include/CSFML/Window/WindowBase.h similarity index 98% rename from include/SFML/Window/WindowBase.h rename to include/CSFML/Window/WindowBase.h index 59b2667..bcd0c88 100644 --- a/include/SFML/Window/WindowBase.h +++ b/include/CSFML/Window/WindowBase.h @@ -27,13 +27,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/WindowHandle.h b/include/CSFML/Window/WindowHandle.h similarity index 98% rename from include/SFML/Window/WindowHandle.h rename to include/CSFML/Window/WindowHandle.h index b33c6fb..d0c4fae 100644 --- a/include/SFML/Window/WindowHandle.h +++ b/include/CSFML/Window/WindowHandle.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/CMakeLists.txt b/src/CSFML/Audio/CMakeLists.txt similarity index 89% rename from src/SFML/Audio/CMakeLists.txt rename to src/CSFML/Audio/CMakeLists.txt index 9c893d7..6f62a34 100644 --- a/src/SFML/Audio/CMakeLists.txt +++ b/src/CSFML/Audio/CMakeLists.txt @@ -1,6 +1,6 @@ -set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/Audio) -set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Audio) +set(INCROOT ${PROJECT_SOURCE_DIR}/include/CSFML/Audio) +set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/Audio) # all source files set(SRC diff --git a/src/SFML/Audio/Listener.cpp b/src/CSFML/Audio/Listener.cpp similarity index 98% rename from src/SFML/Audio/Listener.cpp rename to src/CSFML/Audio/Listener.cpp index ae8283c..51246d1 100644 --- a/src/SFML/Audio/Listener.cpp +++ b/src/CSFML/Audio/Listener.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/src/SFML/Audio/Music.cpp b/src/CSFML/Audio/Music.cpp similarity index 98% rename from src/SFML/Audio/Music.cpp rename to src/CSFML/Audio/Music.cpp index 8348720..73a72d0 100644 --- a/src/SFML/Audio/Music.cpp +++ b/src/CSFML/Audio/Music.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/MusicStruct.h b/src/CSFML/Audio/MusicStruct.h similarity index 97% rename from src/SFML/Audio/MusicStruct.h rename to src/CSFML/Audio/MusicStruct.h index 5e08e73..a1aafaf 100644 --- a/src/SFML/Audio/MusicStruct.h +++ b/src/CSFML/Audio/MusicStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/Sound.cpp b/src/CSFML/Audio/Sound.cpp similarity index 98% rename from src/SFML/Audio/Sound.cpp rename to src/CSFML/Audio/Sound.cpp index db8330b..cef2acd 100644 --- a/src/SFML/Audio/Sound.cpp +++ b/src/CSFML/Audio/Sound.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/CSFML/Audio/SoundBuffer.cpp similarity index 97% rename from src/SFML/Audio/SoundBuffer.cpp rename to src/CSFML/Audio/SoundBuffer.cpp index 43816aa..e7d577b 100644 --- a/src/SFML/Audio/SoundBuffer.cpp +++ b/src/CSFML/Audio/SoundBuffer.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundBufferRecorder.cpp b/src/CSFML/Audio/SoundBufferRecorder.cpp similarity index 96% rename from src/SFML/Audio/SoundBufferRecorder.cpp rename to src/CSFML/Audio/SoundBufferRecorder.cpp index a5112a5..077cfef 100644 --- a/src/SFML/Audio/SoundBufferRecorder.cpp +++ b/src/CSFML/Audio/SoundBufferRecorder.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundBufferRecorderStruct.h b/src/CSFML/Audio/SoundBufferRecorderStruct.h similarity index 97% rename from src/SFML/Audio/SoundBufferRecorderStruct.h rename to src/CSFML/Audio/SoundBufferRecorderStruct.h index c763964..55fefbf 100644 --- a/src/SFML/Audio/SoundBufferRecorderStruct.h +++ b/src/CSFML/Audio/SoundBufferRecorderStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundBufferStruct.h b/src/CSFML/Audio/SoundBufferStruct.h similarity index 100% rename from src/SFML/Audio/SoundBufferStruct.h rename to src/CSFML/Audio/SoundBufferStruct.h diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/CSFML/Audio/SoundRecorder.cpp similarity index 97% rename from src/SFML/Audio/SoundRecorder.cpp rename to src/CSFML/Audio/SoundRecorder.cpp index e3071c5..ff84470 100644 --- a/src/SFML/Audio/SoundRecorder.cpp +++ b/src/CSFML/Audio/SoundRecorder.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundRecorderStruct.h b/src/CSFML/Audio/SoundRecorderStruct.h similarity index 98% rename from src/SFML/Audio/SoundRecorderStruct.h rename to src/CSFML/Audio/SoundRecorderStruct.h index 4bd87f8..0ea2d33 100644 --- a/src/SFML/Audio/SoundRecorderStruct.h +++ b/src/CSFML/Audio/SoundRecorderStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundStream.cpp b/src/CSFML/Audio/SoundStream.cpp similarity index 98% rename from src/SFML/Audio/SoundStream.cpp rename to src/CSFML/Audio/SoundStream.cpp index 9e11ab9..0207e22 100644 --- a/src/SFML/Audio/SoundStream.cpp +++ b/src/CSFML/Audio/SoundStream.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Audio/SoundStreamStruct.h b/src/CSFML/Audio/SoundStreamStruct.h similarity index 99% rename from src/SFML/Audio/SoundStreamStruct.h rename to src/CSFML/Audio/SoundStreamStruct.h index c8fb315..6f14a91 100644 --- a/src/SFML/Audio/SoundStreamStruct.h +++ b/src/CSFML/Audio/SoundStreamStruct.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/src/SFML/Audio/SoundStruct.h b/src/CSFML/Audio/SoundStruct.h similarity index 97% rename from src/SFML/Audio/SoundStruct.h rename to src/CSFML/Audio/SoundStruct.h index 26acff1..fe90d06 100644 --- a/src/SFML/Audio/SoundStruct.h +++ b/src/CSFML/Audio/SoundStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/CMakeLists.txt b/src/CSFML/CMakeLists.txt similarity index 100% rename from src/SFML/CMakeLists.txt rename to src/CSFML/CMakeLists.txt diff --git a/src/SFML/CallbackStream.h b/src/CSFML/CallbackStream.h similarity index 99% rename from src/SFML/CallbackStream.h rename to src/CSFML/CallbackStream.h index 4b0331a..dca60bd 100644 --- a/src/SFML/CallbackStream.h +++ b/src/CSFML/CallbackStream.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Char32.hpp b/src/CSFML/Char32.hpp similarity index 98% rename from src/SFML/Char32.hpp rename to src/CSFML/Char32.hpp index b52805a..f739866 100644 --- a/src/SFML/Char32.hpp +++ b/src/CSFML/Char32.hpp @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include #include diff --git a/src/SFML/ConvertEvent.h b/src/CSFML/ConvertEvent.h similarity index 99% rename from src/SFML/ConvertEvent.h rename to src/CSFML/ConvertEvent.h index c9e7f64..f789731 100644 --- a/src/SFML/ConvertEvent.h +++ b/src/CSFML/ConvertEvent.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/BlendMode.cpp b/src/CSFML/Graphics/BlendMode.cpp similarity index 98% rename from src/SFML/Graphics/BlendMode.cpp rename to src/CSFML/Graphics/BlendMode.cpp index 4e4531f..117cbc7 100644 --- a/src/SFML/Graphics/BlendMode.cpp +++ b/src/CSFML/Graphics/BlendMode.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/CSFML/Graphics/CMakeLists.txt similarity index 94% rename from src/SFML/Graphics/CMakeLists.txt rename to src/CSFML/Graphics/CMakeLists.txt index 72e0567..9cec90f 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/CSFML/Graphics/CMakeLists.txt @@ -1,6 +1,6 @@ -set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/Graphics) -set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Graphics) +set(INCROOT ${PROJECT_SOURCE_DIR}/include/CSFML/Graphics) +set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/Graphics) # all source files set(SRC diff --git a/src/SFML/Graphics/CircleShape.cpp b/src/CSFML/Graphics/CircleShape.cpp similarity index 98% rename from src/SFML/Graphics/CircleShape.cpp rename to src/CSFML/Graphics/CircleShape.cpp index 8b26e3b..ff227f8 100644 --- a/src/SFML/Graphics/CircleShape.cpp +++ b/src/CSFML/Graphics/CircleShape.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/CircleShapeStruct.h b/src/CSFML/Graphics/CircleShapeStruct.h similarity index 95% rename from src/SFML/Graphics/CircleShapeStruct.h rename to src/CSFML/Graphics/CircleShapeStruct.h index 08bafac..00881a0 100644 --- a/src/SFML/Graphics/CircleShapeStruct.h +++ b/src/CSFML/Graphics/CircleShapeStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/Color.cpp b/src/CSFML/Graphics/Color.cpp similarity index 98% rename from src/SFML/Graphics/Color.cpp rename to src/CSFML/Graphics/Color.cpp index b2764a7..7fc20e1 100644 --- a/src/SFML/Graphics/Color.cpp +++ b/src/CSFML/Graphics/Color.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include diff --git a/src/SFML/Graphics/ConvertRenderStates.hpp b/src/CSFML/Graphics/ConvertRenderStates.hpp similarity index 93% rename from src/SFML/Graphics/ConvertRenderStates.hpp rename to src/CSFML/Graphics/ConvertRenderStates.hpp index f733f6d..e76c757 100644 --- a/src/SFML/Graphics/ConvertRenderStates.hpp +++ b/src/CSFML/Graphics/ConvertRenderStates.hpp @@ -27,11 +27,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ConvertTransform.hpp b/src/CSFML/Graphics/ConvertTransform.hpp similarity index 98% rename from src/SFML/Graphics/ConvertTransform.hpp rename to src/CSFML/Graphics/ConvertTransform.hpp index 0b79026..da1c77d 100644 --- a/src/SFML/Graphics/ConvertTransform.hpp +++ b/src/CSFML/Graphics/ConvertTransform.hpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/src/SFML/Graphics/ConvexShape.cpp b/src/CSFML/Graphics/ConvexShape.cpp similarity index 98% rename from src/SFML/Graphics/ConvexShape.cpp rename to src/CSFML/Graphics/ConvexShape.cpp index f40e2e8..ba22e4a 100644 --- a/src/SFML/Graphics/ConvexShape.cpp +++ b/src/CSFML/Graphics/ConvexShape.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ConvexShapeStruct.h b/src/CSFML/Graphics/ConvexShapeStruct.h similarity index 95% rename from src/SFML/Graphics/ConvexShapeStruct.h rename to src/CSFML/Graphics/ConvexShapeStruct.h index 964d398..fc7dc8d 100644 --- a/src/SFML/Graphics/ConvexShapeStruct.h +++ b/src/CSFML/Graphics/ConvexShapeStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/Font.cpp b/src/CSFML/Graphics/Font.cpp similarity index 97% rename from src/SFML/Graphics/Font.cpp rename to src/CSFML/Graphics/Font.cpp index bb3f221..763e319 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/CSFML/Graphics/Font.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/FontStruct.h b/src/CSFML/Graphics/FontStruct.h similarity index 95% rename from src/SFML/Graphics/FontStruct.h rename to src/CSFML/Graphics/FontStruct.h index 7a7543b..c0013f3 100644 --- a/src/SFML/Graphics/FontStruct.h +++ b/src/CSFML/Graphics/FontStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include #include diff --git a/src/SFML/Graphics/Image.cpp b/src/CSFML/Graphics/Image.cpp similarity index 97% rename from src/SFML/Graphics/Image.cpp rename to src/CSFML/Graphics/Image.cpp index 378bc7a..a6e6e19 100644 --- a/src/SFML/Graphics/Image.cpp +++ b/src/CSFML/Graphics/Image.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ImageStruct.h b/src/CSFML/Graphics/ImageStruct.h similarity index 100% rename from src/SFML/Graphics/ImageStruct.h rename to src/CSFML/Graphics/ImageStruct.h diff --git a/src/SFML/Graphics/Rect.cpp b/src/CSFML/Graphics/Rect.cpp similarity index 98% rename from src/SFML/Graphics/Rect.cpp rename to src/CSFML/Graphics/Rect.cpp index 8a4fa6b..ae841b4 100644 --- a/src/SFML/Graphics/Rect.cpp +++ b/src/CSFML/Graphics/Rect.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RectangleShape.cpp b/src/CSFML/Graphics/RectangleShape.cpp similarity index 98% rename from src/SFML/Graphics/RectangleShape.cpp rename to src/CSFML/Graphics/RectangleShape.cpp index 667212b..4b06904 100644 --- a/src/SFML/Graphics/RectangleShape.cpp +++ b/src/CSFML/Graphics/RectangleShape.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RectangleShapeStruct.h b/src/CSFML/Graphics/RectangleShapeStruct.h similarity index 95% rename from src/SFML/Graphics/RectangleShapeStruct.h rename to src/CSFML/Graphics/RectangleShapeStruct.h index e2bc97c..b7a6300 100644 --- a/src/SFML/Graphics/RectangleShapeStruct.h +++ b/src/CSFML/Graphics/RectangleShapeStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RenderStates.cpp b/src/CSFML/Graphics/RenderStates.cpp similarity index 97% rename from src/SFML/Graphics/RenderStates.cpp rename to src/CSFML/Graphics/RenderStates.cpp index bf79145..374cade 100644 --- a/src/SFML/Graphics/RenderStates.cpp +++ b/src/CSFML/Graphics/RenderStates.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include "SFML/Graphics/RenderStates.h" +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RenderTexture.cpp b/src/CSFML/Graphics/RenderTexture.cpp similarity index 94% rename from src/SFML/Graphics/RenderTexture.cpp rename to src/CSFML/Graphics/RenderTexture.cpp index 03aacce..50283ee 100644 --- a/src/SFML/Graphics/RenderTexture.cpp +++ b/src/CSFML/Graphics/RenderTexture.cpp @@ -25,19 +25,19 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RenderTextureStruct.h b/src/CSFML/Graphics/RenderTextureStruct.h similarity index 95% rename from src/SFML/Graphics/RenderTextureStruct.h rename to src/CSFML/Graphics/RenderTextureStruct.h index 81e30a1..ecf8a01 100644 --- a/src/SFML/Graphics/RenderTextureStruct.h +++ b/src/CSFML/Graphics/RenderTextureStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/CSFML/Graphics/RenderWindow.cpp similarity index 96% rename from src/SFML/Graphics/RenderWindow.cpp rename to src/CSFML/Graphics/RenderWindow.cpp index c4ccedd..8d24035 100644 --- a/src/SFML/Graphics/RenderWindow.cpp +++ b/src/CSFML/Graphics/RenderWindow.cpp @@ -25,23 +25,23 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/RenderWindowStruct.h b/src/CSFML/Graphics/RenderWindowStruct.h similarity index 97% rename from src/SFML/Graphics/RenderWindowStruct.h rename to src/CSFML/Graphics/RenderWindowStruct.h index 8403d89..250b6fd 100644 --- a/src/SFML/Graphics/RenderWindowStruct.h +++ b/src/CSFML/Graphics/RenderWindowStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/Shader.cpp b/src/CSFML/Graphics/Shader.cpp similarity index 98% rename from src/SFML/Graphics/Shader.cpp rename to src/CSFML/Graphics/Shader.cpp index 1a50a11..4c6eac9 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/CSFML/Graphics/Shader.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ShaderStruct.h b/src/CSFML/Graphics/ShaderStruct.h similarity index 100% rename from src/SFML/Graphics/ShaderStruct.h rename to src/CSFML/Graphics/ShaderStruct.h diff --git a/src/SFML/Graphics/Shape.cpp b/src/CSFML/Graphics/Shape.cpp similarity index 98% rename from src/SFML/Graphics/Shape.cpp rename to src/CSFML/Graphics/Shape.cpp index ec9767b..17d01a4 100644 --- a/src/SFML/Graphics/Shape.cpp +++ b/src/CSFML/Graphics/Shape.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ShapeStruct.h b/src/CSFML/Graphics/ShapeStruct.h similarity index 96% rename from src/SFML/Graphics/ShapeStruct.h rename to src/CSFML/Graphics/ShapeStruct.h index 75737f1..b3ef52f 100644 --- a/src/SFML/Graphics/ShapeStruct.h +++ b/src/CSFML/Graphics/ShapeStruct.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/Sprite.cpp b/src/CSFML/Graphics/Sprite.cpp similarity index 98% rename from src/SFML/Graphics/Sprite.cpp rename to src/CSFML/Graphics/Sprite.cpp index f069f85..b8b50fa 100644 --- a/src/SFML/Graphics/Sprite.cpp +++ b/src/CSFML/Graphics/Sprite.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/SpriteStruct.h b/src/CSFML/Graphics/SpriteStruct.h similarity index 95% rename from src/SFML/Graphics/SpriteStruct.h rename to src/CSFML/Graphics/SpriteStruct.h index a53fe74..cd20c14 100644 --- a/src/SFML/Graphics/SpriteStruct.h +++ b/src/CSFML/Graphics/SpriteStruct.h @@ -28,8 +28,8 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/Text.cpp b/src/CSFML/Graphics/Text.cpp similarity index 98% rename from src/SFML/Graphics/Text.cpp rename to src/CSFML/Graphics/Text.cpp index c604070..422b94f 100644 --- a/src/SFML/Graphics/Text.cpp +++ b/src/CSFML/Graphics/Text.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/TextStruct.h b/src/CSFML/Graphics/TextStruct.h similarity index 93% rename from src/SFML/Graphics/TextStruct.h rename to src/CSFML/Graphics/TextStruct.h index 694aa67..b9ed34c 100644 --- a/src/SFML/Graphics/TextStruct.h +++ b/src/CSFML/Graphics/TextStruct.h @@ -28,9 +28,9 @@ // Headers //////////////////////////////////////////////////////////// #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/SFML/Graphics/Texture.cpp b/src/CSFML/Graphics/Texture.cpp similarity index 97% rename from src/SFML/Graphics/Texture.cpp rename to src/CSFML/Graphics/Texture.cpp index 7c72b24..f81b26b 100644 --- a/src/SFML/Graphics/Texture.cpp +++ b/src/CSFML/Graphics/Texture.cpp @@ -25,13 +25,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/TextureStruct.h b/src/CSFML/Graphics/TextureStruct.h similarity index 100% rename from src/SFML/Graphics/TextureStruct.h rename to src/CSFML/Graphics/TextureStruct.h diff --git a/src/SFML/Graphics/Transform.cpp b/src/CSFML/Graphics/Transform.cpp similarity index 97% rename from src/SFML/Graphics/Transform.cpp rename to src/CSFML/Graphics/Transform.cpp index 57cfbba..31ed22f 100644 --- a/src/SFML/Graphics/Transform.cpp +++ b/src/CSFML/Graphics/Transform.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include -#include +#include +#include #include diff --git a/src/SFML/Graphics/Transformable.cpp b/src/CSFML/Graphics/Transformable.cpp similarity index 96% rename from src/SFML/Graphics/Transformable.cpp rename to src/CSFML/Graphics/Transformable.cpp index 14739cb..bd9c407 100644 --- a/src/SFML/Graphics/Transformable.cpp +++ b/src/CSFML/Graphics/Transformable.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/TransformableStruct.h b/src/CSFML/Graphics/TransformableStruct.h similarity index 97% rename from src/SFML/Graphics/TransformableStruct.h rename to src/CSFML/Graphics/TransformableStruct.h index 0b6cdfa..86417e9 100644 --- a/src/SFML/Graphics/TransformableStruct.h +++ b/src/CSFML/Graphics/TransformableStruct.h @@ -28,7 +28,7 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/VertexArray.cpp b/src/CSFML/Graphics/VertexArray.cpp similarity index 97% rename from src/SFML/Graphics/VertexArray.cpp rename to src/CSFML/Graphics/VertexArray.cpp index 96e398d..e69cdd9 100644 --- a/src/SFML/Graphics/VertexArray.cpp +++ b/src/CSFML/Graphics/VertexArray.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/VertexArrayStruct.h b/src/CSFML/Graphics/VertexArrayStruct.h similarity index 100% rename from src/SFML/Graphics/VertexArrayStruct.h rename to src/CSFML/Graphics/VertexArrayStruct.h diff --git a/src/SFML/Graphics/VertexBuffer.cpp b/src/CSFML/Graphics/VertexBuffer.cpp similarity index 97% rename from src/SFML/Graphics/VertexBuffer.cpp rename to src/CSFML/Graphics/VertexBuffer.cpp index 4653874..482a6d5 100644 --- a/src/SFML/Graphics/VertexBuffer.cpp +++ b/src/CSFML/Graphics/VertexBuffer.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/VertexBufferStruct.h b/src/CSFML/Graphics/VertexBufferStruct.h similarity index 100% rename from src/SFML/Graphics/VertexBufferStruct.h rename to src/CSFML/Graphics/VertexBufferStruct.h diff --git a/src/SFML/Graphics/View.cpp b/src/CSFML/Graphics/View.cpp similarity index 97% rename from src/SFML/Graphics/View.cpp rename to src/CSFML/Graphics/View.cpp index 7317e89..974a6ec 100644 --- a/src/SFML/Graphics/View.cpp +++ b/src/CSFML/Graphics/View.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ViewStruct.h b/src/CSFML/Graphics/ViewStruct.h similarity index 100% rename from src/SFML/Graphics/ViewStruct.h rename to src/CSFML/Graphics/ViewStruct.h diff --git a/src/SFML/Internal.h b/src/CSFML/Internal.h similarity index 99% rename from src/SFML/Internal.h rename to src/CSFML/Internal.h index ffa60ca..97b51c0 100644 --- a/src/SFML/Internal.h +++ b/src/CSFML/Internal.h @@ -28,7 +28,7 @@ // Define macros to check the validity of CSFML objects in debug run //////////////////////////////////////////////////////////// #include -#include +#include #include #ifndef NDEBUG diff --git a/src/SFML/Main/CMakeLists.txt b/src/CSFML/Main/CMakeLists.txt similarity index 75% rename from src/SFML/Main/CMakeLists.txt rename to src/CSFML/Main/CMakeLists.txt index 031ebf5..4e5f1e7 100644 --- a/src/SFML/Main/CMakeLists.txt +++ b/src/CSFML/Main/CMakeLists.txt @@ -1,6 +1,6 @@ # define the csfml-main target -add_library(csfml-main STATIC ${PROJECT_SOURCE_DIR}/src/SFML/Main/SFML_Main.cpp) +add_library(csfml-main STATIC ${PROJECT_SOURCE_DIR}/src/CSFML/Main/SFML_Main.cpp) # set the debug suffix set_target_properties(csfml-main PROPERTIES DEBUG_POSTFIX -d) diff --git a/src/SFML/Main/SFML_Main.cpp b/src/CSFML/Main/SFML_Main.cpp similarity index 100% rename from src/SFML/Main/SFML_Main.cpp rename to src/CSFML/Main/SFML_Main.cpp diff --git a/src/SFML/Network/CMakeLists.txt b/src/CSFML/Network/CMakeLists.txt similarity index 89% rename from src/SFML/Network/CMakeLists.txt rename to src/CSFML/Network/CMakeLists.txt index 6d13a5b..b80b3db 100644 --- a/src/SFML/Network/CMakeLists.txt +++ b/src/CSFML/Network/CMakeLists.txt @@ -1,6 +1,6 @@ -set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/Network) -set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Network) +set(INCROOT ${PROJECT_SOURCE_DIR}/include/CSFML/Network) +set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/Network) # all source files set(SRC diff --git a/src/SFML/Network/Ftp.cpp b/src/CSFML/Network/Ftp.cpp similarity index 98% rename from src/SFML/Network/Ftp.cpp rename to src/CSFML/Network/Ftp.cpp index 85648ac..eae73b3 100644 --- a/src/SFML/Network/Ftp.cpp +++ b/src/CSFML/Network/Ftp.cpp @@ -25,13 +25,13 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include #include -#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Network/FtpStruct.h b/src/CSFML/Network/FtpStruct.h similarity index 100% rename from src/SFML/Network/FtpStruct.h rename to src/CSFML/Network/FtpStruct.h diff --git a/src/SFML/Network/Http.cpp b/src/CSFML/Network/Http.cpp similarity index 98% rename from src/SFML/Network/Http.cpp rename to src/CSFML/Network/Http.cpp index 55d3211..9a9f0aa 100644 --- a/src/SFML/Network/Http.cpp +++ b/src/CSFML/Network/Http.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Network/HttpStruct.h b/src/CSFML/Network/HttpStruct.h similarity index 100% rename from src/SFML/Network/HttpStruct.h rename to src/CSFML/Network/HttpStruct.h diff --git a/src/SFML/Network/IpAddress.cpp b/src/CSFML/Network/IpAddress.cpp similarity index 99% rename from src/SFML/Network/IpAddress.cpp rename to src/CSFML/Network/IpAddress.cpp index 65680da..bf1da87 100644 --- a/src/SFML/Network/IpAddress.cpp +++ b/src/CSFML/Network/IpAddress.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include #include diff --git a/src/SFML/Network/Packet.cpp b/src/CSFML/Network/Packet.cpp similarity index 98% rename from src/SFML/Network/Packet.cpp rename to src/CSFML/Network/Packet.cpp index 4d506dd..c38387d 100644 --- a/src/SFML/Network/Packet.cpp +++ b/src/CSFML/Network/Packet.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Network/PacketStruct.h b/src/CSFML/Network/PacketStruct.h similarity index 100% rename from src/SFML/Network/PacketStruct.h rename to src/CSFML/Network/PacketStruct.h diff --git a/src/SFML/Network/SocketSelector.cpp b/src/CSFML/Network/SocketSelector.cpp similarity index 94% rename from src/SFML/Network/SocketSelector.cpp rename to src/CSFML/Network/SocketSelector.cpp index 0a74411..06a0521 100644 --- a/src/SFML/Network/SocketSelector.cpp +++ b/src/CSFML/Network/SocketSelector.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Network/SocketSelectorStruct.h b/src/CSFML/Network/SocketSelectorStruct.h similarity index 100% rename from src/SFML/Network/SocketSelectorStruct.h rename to src/CSFML/Network/SocketSelectorStruct.h diff --git a/src/SFML/Network/TcpListener.cpp b/src/CSFML/Network/TcpListener.cpp similarity index 95% rename from src/SFML/Network/TcpListener.cpp rename to src/CSFML/Network/TcpListener.cpp index 8f96d2e..a412351 100644 --- a/src/SFML/Network/TcpListener.cpp +++ b/src/CSFML/Network/TcpListener.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Network/TcpListenerStruct.h b/src/CSFML/Network/TcpListenerStruct.h similarity index 100% rename from src/SFML/Network/TcpListenerStruct.h rename to src/CSFML/Network/TcpListenerStruct.h diff --git a/src/SFML/Network/TcpSocket.cpp b/src/CSFML/Network/TcpSocket.cpp similarity index 97% rename from src/SFML/Network/TcpSocket.cpp rename to src/CSFML/Network/TcpSocket.cpp index b53d671..8dca25b 100644 --- a/src/SFML/Network/TcpSocket.cpp +++ b/src/CSFML/Network/TcpSocket.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include -#include +#include #include diff --git a/src/SFML/Network/TcpSocketStruct.h b/src/CSFML/Network/TcpSocketStruct.h similarity index 100% rename from src/SFML/Network/TcpSocketStruct.h rename to src/CSFML/Network/TcpSocketStruct.h diff --git a/src/SFML/Network/UdpSocket.cpp b/src/CSFML/Network/UdpSocket.cpp similarity index 97% rename from src/SFML/Network/UdpSocket.cpp rename to src/CSFML/Network/UdpSocket.cpp index 2999629..de6051a 100644 --- a/src/SFML/Network/UdpSocket.cpp +++ b/src/CSFML/Network/UdpSocket.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include -#include +#include #include diff --git a/src/SFML/Network/UdpSocketStruct.h b/src/CSFML/Network/UdpSocketStruct.h similarity index 100% rename from src/SFML/Network/UdpSocketStruct.h rename to src/CSFML/Network/UdpSocketStruct.h diff --git a/src/SFML/System/Alloc.cpp b/src/CSFML/System/Alloc.cpp similarity index 97% rename from src/SFML/System/Alloc.cpp rename to src/CSFML/System/Alloc.cpp index e121e24..a59dedc 100644 --- a/src/SFML/System/Alloc.cpp +++ b/src/CSFML/System/Alloc.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include diff --git a/src/SFML/System/Buffer.cpp b/src/CSFML/System/Buffer.cpp similarity index 95% rename from src/SFML/System/Buffer.cpp rename to src/CSFML/System/Buffer.cpp index 3c25e21..b36bb88 100644 --- a/src/SFML/System/Buffer.cpp +++ b/src/CSFML/System/Buffer.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/System/BufferStruct.h b/src/CSFML/System/BufferStruct.h similarity index 100% rename from src/SFML/System/BufferStruct.h rename to src/CSFML/System/BufferStruct.h diff --git a/src/SFML/System/CMakeLists.txt b/src/CSFML/System/CMakeLists.txt similarity index 78% rename from src/SFML/System/CMakeLists.txt rename to src/CSFML/System/CMakeLists.txt index 1147e03..6264c57 100644 --- a/src/SFML/System/CMakeLists.txt +++ b/src/CSFML/System/CMakeLists.txt @@ -1,10 +1,10 @@ -set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/System) -set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/System) +set(INCROOT ${PROJECT_SOURCE_DIR}/include/CSFML/System) +set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/System) # all source files set(SRC - ${PROJECT_SOURCE_DIR}/include/SFML/GPUPreference.h + ${PROJECT_SOURCE_DIR}/include/CSFML/GPUPreference.h ${INCROOT}/Export.h ${SRCROOT}/Alloc.cpp ${INCROOT}/Alloc.h diff --git a/src/SFML/System/Clock.cpp b/src/CSFML/System/Clock.cpp similarity index 95% rename from src/SFML/System/Clock.cpp rename to src/CSFML/System/Clock.cpp index 460339b..83279ea 100644 --- a/src/SFML/System/Clock.cpp +++ b/src/CSFML/System/Clock.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/System/ClockStruct.h b/src/CSFML/System/ClockStruct.h similarity index 100% rename from src/SFML/System/ClockStruct.h rename to src/CSFML/System/ClockStruct.h diff --git a/src/SFML/System/Sleep.cpp b/src/CSFML/System/Sleep.cpp similarity index 96% rename from src/SFML/System/Sleep.cpp rename to src/CSFML/System/Sleep.cpp index 92a019c..5b39204 100644 --- a/src/SFML/System/Sleep.cpp +++ b/src/CSFML/System/Sleep.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/System/Time.cpp b/src/CSFML/System/Time.cpp similarity index 98% rename from src/SFML/System/Time.cpp rename to src/CSFML/System/Time.cpp index ab0504b..7524da9 100644 --- a/src/SFML/System/Time.cpp +++ b/src/CSFML/System/Time.cpp @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/CMakeLists.txt b/src/CSFML/Window/CMakeLists.txt similarity index 91% rename from src/SFML/Window/CMakeLists.txt rename to src/CSFML/Window/CMakeLists.txt index 405c01a..aadb1ff 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/CSFML/Window/CMakeLists.txt @@ -1,6 +1,6 @@ -set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/Window) -set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Window) +set(INCROOT ${PROJECT_SOURCE_DIR}/include/CSFML/Window) +set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/Window) # all source files set(SRC diff --git a/src/SFML/Window/Clipboard.cpp b/src/CSFML/Window/Clipboard.cpp similarity index 97% rename from src/SFML/Window/Clipboard.cpp rename to src/CSFML/Window/Clipboard.cpp index e75d0e8..a96de19 100644 --- a/src/SFML/Window/Clipboard.cpp +++ b/src/CSFML/Window/Clipboard.cpp @@ -26,9 +26,9 @@ // Headers //////////////////////////////////////////////////////////// #include -#include +#include #include -#include +#include #include diff --git a/src/SFML/Window/Context.cpp b/src/CSFML/Window/Context.cpp similarity index 94% rename from src/SFML/Window/Context.cpp rename to src/CSFML/Window/Context.cpp index 061cc37..7a6cae5 100644 --- a/src/SFML/Window/Context.cpp +++ b/src/CSFML/Window/Context.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/ContextSettingsInternal.h b/src/CSFML/Window/ContextSettingsInternal.h similarity index 99% rename from src/SFML/Window/ContextSettingsInternal.h rename to src/CSFML/Window/ContextSettingsInternal.h index 2597308..dd5a0b6 100644 --- a/src/SFML/Window/ContextSettingsInternal.h +++ b/src/CSFML/Window/ContextSettingsInternal.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include namespace priv diff --git a/src/SFML/Window/ContextStruct.h b/src/CSFML/Window/ContextStruct.h similarity index 100% rename from src/SFML/Window/ContextStruct.h rename to src/CSFML/Window/ContextStruct.h diff --git a/src/SFML/Window/Cursor.cpp b/src/CSFML/Window/Cursor.cpp similarity index 95% rename from src/SFML/Window/Cursor.cpp rename to src/CSFML/Window/Cursor.cpp index d4b8c5d..55dc016 100644 --- a/src/SFML/Window/Cursor.cpp +++ b/src/CSFML/Window/Cursor.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/CursorStruct.h b/src/CSFML/Window/CursorStruct.h similarity index 100% rename from src/SFML/Window/CursorStruct.h rename to src/CSFML/Window/CursorStruct.h diff --git a/src/SFML/Window/Joystick.cpp b/src/CSFML/Window/Joystick.cpp similarity index 97% rename from src/SFML/Window/Joystick.cpp rename to src/CSFML/Window/Joystick.cpp index c722da6..5a88155 100644 --- a/src/SFML/Window/Joystick.cpp +++ b/src/CSFML/Window/Joystick.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/Keyboard.cpp b/src/CSFML/Window/Keyboard.cpp similarity index 97% rename from src/SFML/Window/Keyboard.cpp rename to src/CSFML/Window/Keyboard.cpp index 17743a5..477b71f 100644 --- a/src/SFML/Window/Keyboard.cpp +++ b/src/CSFML/Window/Keyboard.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include +#include #include #include diff --git a/src/SFML/Window/Mouse.cpp b/src/CSFML/Window/Mouse.cpp similarity index 95% rename from src/SFML/Window/Mouse.cpp rename to src/CSFML/Window/Mouse.cpp index 559a032..70c0482 100644 --- a/src/SFML/Window/Mouse.cpp +++ b/src/CSFML/Window/Mouse.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/Sensor.cpp b/src/CSFML/Window/Sensor.cpp similarity index 96% rename from src/SFML/Window/Sensor.cpp rename to src/CSFML/Window/Sensor.cpp index fc1cf4d..4bdbf43 100644 --- a/src/SFML/Window/Sensor.cpp +++ b/src/CSFML/Window/Sensor.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/Touch.cpp b/src/CSFML/Window/Touch.cpp similarity index 94% rename from src/SFML/Window/Touch.cpp rename to src/CSFML/Window/Touch.cpp index 05385a4..2b3be49 100644 --- a/src/SFML/Window/Touch.cpp +++ b/src/CSFML/Window/Touch.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include -#include -#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/VideoMode.cpp b/src/CSFML/Window/VideoMode.cpp similarity index 97% rename from src/SFML/Window/VideoMode.cpp rename to src/CSFML/Window/VideoMode.cpp index d8fbcde..d427cd7 100644 --- a/src/SFML/Window/VideoMode.cpp +++ b/src/CSFML/Window/VideoMode.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/Vulkan.cpp b/src/CSFML/Window/Vulkan.cpp similarity index 96% rename from src/SFML/Window/Vulkan.cpp rename to src/CSFML/Window/Vulkan.cpp index e48f43f..152cde3 100644 --- a/src/SFML/Window/Vulkan.cpp +++ b/src/CSFML/Window/Vulkan.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include +#include +#include #include #include diff --git a/src/SFML/Window/Window.cpp b/src/CSFML/Window/Window.cpp similarity index 97% rename from src/SFML/Window/Window.cpp rename to src/CSFML/Window/Window.cpp index 64604c8..0397fc8 100644 --- a/src/SFML/Window/Window.cpp +++ b/src/CSFML/Window/Window.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/WindowBase.cpp b/src/CSFML/Window/WindowBase.cpp similarity index 97% rename from src/SFML/Window/WindowBase.cpp rename to src/CSFML/Window/WindowBase.cpp index a94cc9d..913361a 100644 --- a/src/SFML/Window/WindowBase.cpp +++ b/src/CSFML/Window/WindowBase.cpp @@ -25,12 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/WindowBaseStruct.h b/src/CSFML/Window/WindowBaseStruct.h similarity index 100% rename from src/SFML/Window/WindowBaseStruct.h rename to src/CSFML/Window/WindowBaseStruct.h diff --git a/src/SFML/Window/WindowStruct.h b/src/CSFML/Window/WindowStruct.h similarity index 100% rename from src/SFML/Window/WindowStruct.h rename to src/CSFML/Window/WindowStruct.h diff --git a/test/System/Buffer.test.cpp b/test/System/Buffer.test.cpp index b84674e..b34fd1a 100644 --- a/test/System/Buffer.test.cpp +++ b/test/System/Buffer.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/System/Clock.test.cpp b/test/System/Clock.test.cpp index db8e375..6b19cbe 100644 --- a/test/System/Clock.test.cpp +++ b/test/System/Clock.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/System/Sleep.test.cpp b/test/System/Sleep.test.cpp index bab1e23..dceb1cb 100644 --- a/test/System/Sleep.test.cpp +++ b/test/System/Sleep.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/System/Time.test.cpp b/test/System/Time.test.cpp index bb804a5..32f0fc1 100644 --- a/test/System/Time.test.cpp +++ b/test/System/Time.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/System/Vector2.test.cpp b/test/System/Vector2.test.cpp index 74d5edc..3dd2e2d 100644 --- a/test/System/Vector2.test.cpp +++ b/test/System/Vector2.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/System/Vector3.test.cpp b/test/System/Vector3.test.cpp index 26e5706..393bd6f 100644 --- a/test/System/Vector3.test.cpp +++ b/test/System/Vector3.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/test/Window/Joystick.test.cpp b/test/Window/Joystick.test.cpp index 9598e4a..804924b 100644 --- a/test/Window/Joystick.test.cpp +++ b/test/Window/Joystick.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tools/BuildMacOS.sh b/tools/BuildMacOS.sh index d9af759..ceab487 100644 --- a/tools/BuildMacOS.sh +++ b/tools/BuildMacOS.sh @@ -573,7 +573,7 @@ minimal_install_package "$sfml_package1070" build_csfml 'clang' 'doc' '10.7 SDK' create_dir "$csfml_package1070/include/" -copy "$installdir/usr/local/include/SFML" \ +copy "$installdir/usr/local/include/CSFML" \ "$csfml_package1070/include/" create_dir "$csfml_package1070/lib/"