diff --git a/.gitignore b/.gitignore index 3c211ff..54e5a95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ # Build folders build-rpg-Desktop_Qt_5_4_0_MinGW_32bit-Debug/* -build-rpg-Desktop_Qt_5_4_0_MinGW_32bit-Release/* \ No newline at end of file +build-rpg-Desktop_Qt_5_4_0_MinGW_32bit-Release/* + +# QT Creator pro.user +src/rpg.pro.user \ No newline at end of file diff --git a/src/include/SFML/include/SFML/Audio.hpp b/src/include/SFML/Audio.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio.hpp rename to src/include/SFML/Audio.hpp diff --git a/src/include/SFML/include/SFML/Audio/Export.hpp b/src/include/SFML/Audio/Export.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/Export.hpp rename to src/include/SFML/Audio/Export.hpp diff --git a/src/include/SFML/include/SFML/Audio/Listener.hpp b/src/include/SFML/Audio/Listener.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/Listener.hpp rename to src/include/SFML/Audio/Listener.hpp diff --git a/src/include/SFML/include/SFML/Audio/Music.hpp b/src/include/SFML/Audio/Music.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/Music.hpp rename to src/include/SFML/Audio/Music.hpp diff --git a/src/include/SFML/include/SFML/Audio/Sound.hpp b/src/include/SFML/Audio/Sound.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/Sound.hpp rename to src/include/SFML/Audio/Sound.hpp diff --git a/src/include/SFML/include/SFML/Audio/SoundBuffer.hpp b/src/include/SFML/Audio/SoundBuffer.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/SoundBuffer.hpp rename to src/include/SFML/Audio/SoundBuffer.hpp diff --git a/src/include/SFML/include/SFML/Audio/SoundBufferRecorder.hpp b/src/include/SFML/Audio/SoundBufferRecorder.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/SoundBufferRecorder.hpp rename to src/include/SFML/Audio/SoundBufferRecorder.hpp diff --git a/src/include/SFML/include/SFML/Audio/SoundRecorder.hpp b/src/include/SFML/Audio/SoundRecorder.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/SoundRecorder.hpp rename to src/include/SFML/Audio/SoundRecorder.hpp diff --git a/src/include/SFML/include/SFML/Audio/SoundSource.hpp b/src/include/SFML/Audio/SoundSource.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/SoundSource.hpp rename to src/include/SFML/Audio/SoundSource.hpp diff --git a/src/include/SFML/include/SFML/Audio/SoundStream.hpp b/src/include/SFML/Audio/SoundStream.hpp similarity index 100% rename from src/include/SFML/include/SFML/Audio/SoundStream.hpp rename to src/include/SFML/Audio/SoundStream.hpp diff --git a/src/include/SFML/include/SFML/Config.hpp b/src/include/SFML/Config.hpp similarity index 100% rename from src/include/SFML/include/SFML/Config.hpp rename to src/include/SFML/Config.hpp diff --git a/src/include/SFML/include/SFML/Graphics.hpp b/src/include/SFML/Graphics.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics.hpp rename to src/include/SFML/Graphics.hpp diff --git a/src/include/SFML/include/SFML/Graphics/BlendMode.hpp b/src/include/SFML/Graphics/BlendMode.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/BlendMode.hpp rename to src/include/SFML/Graphics/BlendMode.hpp diff --git a/src/include/SFML/include/SFML/Graphics/CircleShape.hpp b/src/include/SFML/Graphics/CircleShape.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/CircleShape.hpp rename to src/include/SFML/Graphics/CircleShape.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Color.hpp b/src/include/SFML/Graphics/Color.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Color.hpp rename to src/include/SFML/Graphics/Color.hpp diff --git a/src/include/SFML/include/SFML/Graphics/ConvexShape.hpp b/src/include/SFML/Graphics/ConvexShape.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/ConvexShape.hpp rename to src/include/SFML/Graphics/ConvexShape.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Drawable.hpp b/src/include/SFML/Graphics/Drawable.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Drawable.hpp rename to src/include/SFML/Graphics/Drawable.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Export.hpp b/src/include/SFML/Graphics/Export.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Export.hpp rename to src/include/SFML/Graphics/Export.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Font.hpp b/src/include/SFML/Graphics/Font.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Font.hpp rename to src/include/SFML/Graphics/Font.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Glyph.hpp b/src/include/SFML/Graphics/Glyph.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Glyph.hpp rename to src/include/SFML/Graphics/Glyph.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Image.hpp b/src/include/SFML/Graphics/Image.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Image.hpp rename to src/include/SFML/Graphics/Image.hpp diff --git a/src/include/SFML/include/SFML/Graphics/PrimitiveType.hpp b/src/include/SFML/Graphics/PrimitiveType.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/PrimitiveType.hpp rename to src/include/SFML/Graphics/PrimitiveType.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Rect.hpp b/src/include/SFML/Graphics/Rect.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Rect.hpp rename to src/include/SFML/Graphics/Rect.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Rect.inl b/src/include/SFML/Graphics/Rect.inl similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Rect.inl rename to src/include/SFML/Graphics/Rect.inl diff --git a/src/include/SFML/include/SFML/Graphics/RectangleShape.hpp b/src/include/SFML/Graphics/RectangleShape.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/RectangleShape.hpp rename to src/include/SFML/Graphics/RectangleShape.hpp diff --git a/src/include/SFML/include/SFML/Graphics/RenderStates.hpp b/src/include/SFML/Graphics/RenderStates.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/RenderStates.hpp rename to src/include/SFML/Graphics/RenderStates.hpp diff --git a/src/include/SFML/include/SFML/Graphics/RenderTarget.hpp b/src/include/SFML/Graphics/RenderTarget.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/RenderTarget.hpp rename to src/include/SFML/Graphics/RenderTarget.hpp diff --git a/src/include/SFML/include/SFML/Graphics/RenderTexture.hpp b/src/include/SFML/Graphics/RenderTexture.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/RenderTexture.hpp rename to src/include/SFML/Graphics/RenderTexture.hpp diff --git a/src/include/SFML/include/SFML/Graphics/RenderWindow.hpp b/src/include/SFML/Graphics/RenderWindow.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/RenderWindow.hpp rename to src/include/SFML/Graphics/RenderWindow.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Shader.hpp b/src/include/SFML/Graphics/Shader.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Shader.hpp rename to src/include/SFML/Graphics/Shader.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Shape.hpp b/src/include/SFML/Graphics/Shape.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Shape.hpp rename to src/include/SFML/Graphics/Shape.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Sprite.hpp b/src/include/SFML/Graphics/Sprite.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Sprite.hpp rename to src/include/SFML/Graphics/Sprite.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Text.hpp b/src/include/SFML/Graphics/Text.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Text.hpp rename to src/include/SFML/Graphics/Text.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Texture.hpp b/src/include/SFML/Graphics/Texture.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Texture.hpp rename to src/include/SFML/Graphics/Texture.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Transform.hpp b/src/include/SFML/Graphics/Transform.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Transform.hpp rename to src/include/SFML/Graphics/Transform.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Transformable.hpp b/src/include/SFML/Graphics/Transformable.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Transformable.hpp rename to src/include/SFML/Graphics/Transformable.hpp diff --git a/src/include/SFML/include/SFML/Graphics/Vertex.hpp b/src/include/SFML/Graphics/Vertex.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/Vertex.hpp rename to src/include/SFML/Graphics/Vertex.hpp diff --git a/src/include/SFML/include/SFML/Graphics/VertexArray.hpp b/src/include/SFML/Graphics/VertexArray.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/VertexArray.hpp rename to src/include/SFML/Graphics/VertexArray.hpp diff --git a/src/include/SFML/include/SFML/Graphics/View.hpp b/src/include/SFML/Graphics/View.hpp similarity index 100% rename from src/include/SFML/include/SFML/Graphics/View.hpp rename to src/include/SFML/Graphics/View.hpp diff --git a/src/include/SFML/include/SFML/Network.hpp b/src/include/SFML/Network.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network.hpp rename to src/include/SFML/Network.hpp diff --git a/src/include/SFML/include/SFML/Network/Export.hpp b/src/include/SFML/Network/Export.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/Export.hpp rename to src/include/SFML/Network/Export.hpp diff --git a/src/include/SFML/include/SFML/Network/Ftp.hpp b/src/include/SFML/Network/Ftp.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/Ftp.hpp rename to src/include/SFML/Network/Ftp.hpp diff --git a/src/include/SFML/include/SFML/Network/Http.hpp b/src/include/SFML/Network/Http.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/Http.hpp rename to src/include/SFML/Network/Http.hpp diff --git a/src/include/SFML/include/SFML/Network/IpAddress.hpp b/src/include/SFML/Network/IpAddress.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/IpAddress.hpp rename to src/include/SFML/Network/IpAddress.hpp diff --git a/src/include/SFML/include/SFML/Network/Packet.hpp b/src/include/SFML/Network/Packet.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/Packet.hpp rename to src/include/SFML/Network/Packet.hpp diff --git a/src/include/SFML/include/SFML/Network/Socket.hpp b/src/include/SFML/Network/Socket.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/Socket.hpp rename to src/include/SFML/Network/Socket.hpp diff --git a/src/include/SFML/include/SFML/Network/SocketHandle.hpp b/src/include/SFML/Network/SocketHandle.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/SocketHandle.hpp rename to src/include/SFML/Network/SocketHandle.hpp diff --git a/src/include/SFML/Network/SocketSelector.hpp b/src/include/SFML/Network/SocketSelector.hpp new file mode 100644 index 0000000..668b59f --- /dev/null +++ b/src/include/SFML/Network/SocketSelector.hpp @@ -0,0 +1,263 @@ +//////////////////////////////////////////////////////////// +// +// SFML - Simple and Fast Multimedia Library +// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com) +// +// This software is provided 'as-is', without any express or implied warranty. +// In no event will the authors be held liable for any damages arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it freely, +// subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; +// you must not claim that you wrote the original software. +// If you use this software in a product, an acknowledgment +// in the product documentation would be appreciated but is not required. +// +// 2. Altered source versions must be plainly marked as such, +// and must not be misrepresented as being the original software. +// +// 3. This notice may not be removed or altered from any source distribution. +// +//////////////////////////////////////////////////////////// + +#ifndef SFML_SOCKETSELECTOR_HPP +#define SFML_SOCKETSELECTOR_HPP + +//////////////////////////////////////////////////////////// +// Headers +//////////////////////////////////////////////////////////// +#include +#include + + +namespace sf +{ +class Socket; + +//////////////////////////////////////////////////////////// +/// \brief Multiplexer that allows to read from multiple sockets +/// +//////////////////////////////////////////////////////////// +class SFML_NETWORK_API SocketSelector +{ +public : + + //////////////////////////////////////////////////////////// + /// \brief Default constructor + /// + //////////////////////////////////////////////////////////// + SocketSelector(); + + //////////////////////////////////////////////////////////// + /// \brief Copy constructor + /// + /// \param copy Instance to copy + /// + //////////////////////////////////////////////////////////// + SocketSelector(const SocketSelector& copy); + + //////////////////////////////////////////////////////////// + /// \brief Destructor + /// + //////////////////////////////////////////////////////////// + ~SocketSelector(); + + //////////////////////////////////////////////////////////// + /// \brief Add a new socket to the selector + /// + /// This function keeps a weak reference to the socket, + /// so you have to make sure that the socket is not destroyed + /// while it is stored in the selector. + /// This function does nothing if the socket is not valid. + /// + /// \param socket Reference to the socket to add + /// + /// \see remove, clear + /// + //////////////////////////////////////////////////////////// + void add(Socket& socket); + + //////////////////////////////////////////////////////////// + /// \brief Remove a socket from the selector + /// + /// This function doesn't destroy the socket, it simply + /// removes the reference that the selector has to it. + /// + /// \param socket Reference to the socket to remove + /// + /// \see add, clear + /// + //////////////////////////////////////////////////////////// + void remove(Socket& socket); + + //////////////////////////////////////////////////////////// + /// \brief Remove all the sockets stored in the selector + /// + /// This function doesn't destroy any instance, it simply + /// removes all the references that the selector has to + /// external sockets. + /// + /// \see add, remove + /// + //////////////////////////////////////////////////////////// + void clear(); + + //////////////////////////////////////////////////////////// + /// \brief Wait until one or more sockets are ready to receive + /// + /// This function returns as soon as at least one socket has + /// some data available to be received. To know which sockets are + /// ready, use the isReady function. + /// If you use a timeout and no socket is ready before the timeout + /// is over, the function returns false. + /// + /// \param timeout Maximum time to wait, (use Time::Zero for infinity) + /// + /// \return True if there are sockets ready, false otherwise + /// + /// \see isReady + /// + //////////////////////////////////////////////////////////// + bool wait(Time timeout = Time::Zero); + + //////////////////////////////////////////////////////////// + /// \brief Test a socket to know if it is ready to receive data + /// + /// This function must be used after a call to Wait, to know + /// which sockets are ready to receive data. If a socket is + /// ready, a call to receive will never block because we know + /// that there is data available to read. + /// Note that if this function returns true for a TcpListener, + /// this means that it is ready to accept a new connection. + /// + /// \param socket Socket to test + /// + /// \return True if the socket is ready to read, false otherwise + /// + /// \see isReady + /// + //////////////////////////////////////////////////////////// + bool isReady(Socket& socket) const; + + //////////////////////////////////////////////////////////// + /// \brief Overload of assignment operator + /// + /// \param right Instance to assign + /// + /// \return Reference to self + /// + //////////////////////////////////////////////////////////// + SocketSelector& operator =(const SocketSelector& right); + +private : + + struct SocketSelectorImpl; + + //////////////////////////////////////////////////////////// + // Member data + //////////////////////////////////////////////////////////// + SocketSelectorImpl* m_impl; ///< Opaque pointer to the implementation (which requires OS-specific types) +}; + +} // namespace sf + + +#endif // SFML_SOCKETSELECTOR_HPP + + +//////////////////////////////////////////////////////////// +/// \class sf::SocketSelector +/// \ingroup network +/// +/// Socket selectors provide a way to wait until some data is +/// available on a set of sockets, instead of just one. This +/// is convenient when you have multiple sockets that may +/// possibly receive data, but you don't know which one will +/// be ready first. In particular, it avoids to use a thread +/// for each socket; with selectors, a single thread can handle +/// all the sockets. +/// +/// All types of sockets can be used in a selector: +/// \li sf::TcpListener +/// \li sf::TcpSocket +/// \li sf::UdpSocket +/// +/// A selector doesn't store its own copies of the sockets +/// (socket classes are not copyable anyway), it simply keeps +/// a reference to the original sockets that you pass to the +/// "add" function. Therefore, you can't use the selector as a +/// socket container, you must store them oustide and make sure +/// that they are alive as long as they are used in the selector. +/// +/// Using a selector is simple: +/// \li populate the selector with all the sockets that you want to observe +/// \li make it wait until there is data available on any of the sockets +/// \li test each socket to find out which ones are ready +/// +/// Usage example: +/// \code +/// // Create a socket to listen to new connections +/// sf::TcpListener listener; +/// listener.listen(55001); +/// +/// // Create a list to store the future clients +/// std::list clients; +/// +/// // Create a selector +/// sf::SocketSelector selector; +/// +/// // Add the listener to the selector +/// selector.add(listener); +/// +/// // Endless loop that waits for new connections +/// while (running) +/// { +/// // Make the selector wait for data on any socket +/// if (selector.wait()) +/// { +/// // Test the listener +/// if (selector.isReady(listener)) +/// { +/// // The listener is ready: there is a pending connection +/// sf::TcpSocket* client = new sf::TcpSocket; +/// if (listener.accept(*client) == sf::Socket::Done) +/// { +/// // Add the new client to the clients list +/// clients.push_back(client); +/// +/// // Add the new client to the selector so that we will +/// // be notified when he sends something +/// selector.add(*client); +/// } +/// else +/// { +/// // Error, we won't get a new connection, delete the socket +/// delete client; +/// } +/// } +/// else +/// { +/// // The listener socket is not ready, test all other sockets (the clients) +/// for (std::list::iterator it = clients.begin(); it != clients.end(); ++it) +/// { +/// sf::TcpSocket& client = **it; +/// if (selector.isReady(client)) +/// { +/// // The client has sent some data, we can receive it +/// sf::Packet packet; +/// if (client.receive(packet) == sf::Socket::Done) +/// { +/// ... +/// } +/// } +/// } +/// } +/// } +/// } +/// \endcode +/// +/// \see sf::Socket +/// +//////////////////////////////////////////////////////////// diff --git a/src/include/SFML/include/SFML/Network/TcpListener.hpp b/src/include/SFML/Network/TcpListener.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/TcpListener.hpp rename to src/include/SFML/Network/TcpListener.hpp diff --git a/src/include/SFML/include/SFML/Network/TcpSocket.hpp b/src/include/SFML/Network/TcpSocket.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/TcpSocket.hpp rename to src/include/SFML/Network/TcpSocket.hpp diff --git a/src/include/SFML/include/SFML/Network/UdpSocket.hpp b/src/include/SFML/Network/UdpSocket.hpp similarity index 100% rename from src/include/SFML/include/SFML/Network/UdpSocket.hpp rename to src/include/SFML/Network/UdpSocket.hpp diff --git a/src/include/SFML/include/SFML/OpenGL.hpp b/src/include/SFML/OpenGL.hpp similarity index 100% rename from src/include/SFML/include/SFML/OpenGL.hpp rename to src/include/SFML/OpenGL.hpp diff --git a/src/include/SFML/include/SFML/System.hpp b/src/include/SFML/System.hpp similarity index 100% rename from src/include/SFML/include/SFML/System.hpp rename to src/include/SFML/System.hpp diff --git a/src/include/SFML/include/SFML/System/Clock.hpp b/src/include/SFML/System/Clock.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Clock.hpp rename to src/include/SFML/System/Clock.hpp diff --git a/src/include/SFML/include/SFML/System/Err.hpp b/src/include/SFML/System/Err.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Err.hpp rename to src/include/SFML/System/Err.hpp diff --git a/src/include/SFML/include/SFML/System/Export.hpp b/src/include/SFML/System/Export.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Export.hpp rename to src/include/SFML/System/Export.hpp diff --git a/src/include/SFML/include/SFML/System/InputStream.hpp b/src/include/SFML/System/InputStream.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/InputStream.hpp rename to src/include/SFML/System/InputStream.hpp diff --git a/src/include/SFML/include/SFML/System/Lock.hpp b/src/include/SFML/System/Lock.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Lock.hpp rename to src/include/SFML/System/Lock.hpp diff --git a/src/include/SFML/include/SFML/System/Mutex.hpp b/src/include/SFML/System/Mutex.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Mutex.hpp rename to src/include/SFML/System/Mutex.hpp diff --git a/src/include/SFML/include/SFML/System/NonCopyable.hpp b/src/include/SFML/System/NonCopyable.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/NonCopyable.hpp rename to src/include/SFML/System/NonCopyable.hpp diff --git a/src/include/SFML/include/SFML/System/Sleep.hpp b/src/include/SFML/System/Sleep.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Sleep.hpp rename to src/include/SFML/System/Sleep.hpp diff --git a/src/include/SFML/include/SFML/System/String.hpp b/src/include/SFML/System/String.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/String.hpp rename to src/include/SFML/System/String.hpp diff --git a/src/include/SFML/include/SFML/System/Thread.hpp b/src/include/SFML/System/Thread.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Thread.hpp rename to src/include/SFML/System/Thread.hpp diff --git a/src/include/SFML/include/SFML/System/Thread.inl b/src/include/SFML/System/Thread.inl similarity index 100% rename from src/include/SFML/include/SFML/System/Thread.inl rename to src/include/SFML/System/Thread.inl diff --git a/src/include/SFML/include/SFML/System/ThreadLocal.hpp b/src/include/SFML/System/ThreadLocal.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/ThreadLocal.hpp rename to src/include/SFML/System/ThreadLocal.hpp diff --git a/src/include/SFML/include/SFML/System/ThreadLocalPtr.hpp b/src/include/SFML/System/ThreadLocalPtr.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/ThreadLocalPtr.hpp rename to src/include/SFML/System/ThreadLocalPtr.hpp diff --git a/src/include/SFML/include/SFML/System/ThreadLocalPtr.inl b/src/include/SFML/System/ThreadLocalPtr.inl similarity index 100% rename from src/include/SFML/include/SFML/System/ThreadLocalPtr.inl rename to src/include/SFML/System/ThreadLocalPtr.inl diff --git a/src/include/SFML/include/SFML/System/Time.hpp b/src/include/SFML/System/Time.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Time.hpp rename to src/include/SFML/System/Time.hpp diff --git a/src/include/SFML/include/SFML/System/Utf.hpp b/src/include/SFML/System/Utf.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Utf.hpp rename to src/include/SFML/System/Utf.hpp diff --git a/src/include/SFML/include/SFML/System/Utf.inl b/src/include/SFML/System/Utf.inl similarity index 100% rename from src/include/SFML/include/SFML/System/Utf.inl rename to src/include/SFML/System/Utf.inl diff --git a/src/include/SFML/include/SFML/System/Vector2.hpp b/src/include/SFML/System/Vector2.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Vector2.hpp rename to src/include/SFML/System/Vector2.hpp diff --git a/src/include/SFML/include/SFML/System/Vector2.inl b/src/include/SFML/System/Vector2.inl similarity index 100% rename from src/include/SFML/include/SFML/System/Vector2.inl rename to src/include/SFML/System/Vector2.inl diff --git a/src/include/SFML/include/SFML/System/Vector3.hpp b/src/include/SFML/System/Vector3.hpp similarity index 100% rename from src/include/SFML/include/SFML/System/Vector3.hpp rename to src/include/SFML/System/Vector3.hpp diff --git a/src/include/SFML/include/SFML/System/Vector3.inl b/src/include/SFML/System/Vector3.inl similarity index 100% rename from src/include/SFML/include/SFML/System/Vector3.inl rename to src/include/SFML/System/Vector3.inl diff --git a/src/include/SFML/include/SFML/Window.hpp b/src/include/SFML/Window.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window.hpp rename to src/include/SFML/Window.hpp diff --git a/src/include/SFML/include/SFML/Window/Context.hpp b/src/include/SFML/Window/Context.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Context.hpp rename to src/include/SFML/Window/Context.hpp diff --git a/src/include/SFML/include/SFML/Window/ContextSettings.hpp b/src/include/SFML/Window/ContextSettings.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/ContextSettings.hpp rename to src/include/SFML/Window/ContextSettings.hpp diff --git a/src/include/SFML/include/SFML/Window/Event.hpp b/src/include/SFML/Window/Event.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Event.hpp rename to src/include/SFML/Window/Event.hpp diff --git a/src/include/SFML/include/SFML/Window/Export.hpp b/src/include/SFML/Window/Export.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Export.hpp rename to src/include/SFML/Window/Export.hpp diff --git a/src/include/SFML/include/SFML/Window/GlResource.hpp b/src/include/SFML/Window/GlResource.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/GlResource.hpp rename to src/include/SFML/Window/GlResource.hpp diff --git a/src/include/SFML/include/SFML/Window/Joystick.hpp b/src/include/SFML/Window/Joystick.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Joystick.hpp rename to src/include/SFML/Window/Joystick.hpp diff --git a/src/include/SFML/include/SFML/Window/Keyboard.hpp b/src/include/SFML/Window/Keyboard.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Keyboard.hpp rename to src/include/SFML/Window/Keyboard.hpp diff --git a/src/include/SFML/include/SFML/Window/Mouse.hpp b/src/include/SFML/Window/Mouse.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Mouse.hpp rename to src/include/SFML/Window/Mouse.hpp diff --git a/src/include/SFML/include/SFML/Window/VideoMode.hpp b/src/include/SFML/Window/VideoMode.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/VideoMode.hpp rename to src/include/SFML/Window/VideoMode.hpp diff --git a/src/include/SFML/include/SFML/Window/Window.hpp b/src/include/SFML/Window/Window.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/Window.hpp rename to src/include/SFML/Window/Window.hpp diff --git a/src/include/SFML/include/SFML/Window/WindowHandle.hpp b/src/include/SFML/Window/WindowHandle.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/WindowHandle.hpp rename to src/include/SFML/Window/WindowHandle.hpp diff --git a/src/include/SFML/include/SFML/Window/WindowStyle.hpp b/src/include/SFML/Window/WindowStyle.hpp similarity index 100% rename from src/include/SFML/include/SFML/Window/WindowStyle.hpp rename to src/include/SFML/Window/WindowStyle.hpp diff --git a/src/rpg.pro b/src/rpg.pro index 10c004e..cc91460 100644 --- a/src/rpg.pro +++ b/src/rpg.pro @@ -6,16 +6,14 @@ CONFIG -= qt include(deployment.pri) qtcAddDeployment() +LIBS += -L"$$PWD/include" LIBS += -L"$$PWD/include/SFML/lib" -LIBS += -L"$$PWD/include/rapidjson" CONFIG(release, debug|release): LIBS += -lsfml-audio -lsfml-graphics -lsfml-main -lsfml-network -lsfml-window -lsfml-system CONFIG(debug, debug|release): LIBS += -lsfml-audio-d -lsfml-graphics-d -lsfml-main-d -lsfml-network-d -lsfml-window-d -lsfml-system-d -INCLUDEPATH += $$PWD/include/SFML/include -INCLUDEPATH += $$PWD/include/rapidjson -DEPENDPATH += $$PWD/include/SFML/include -DEPENDPATH += $$PWD/include/rapidjson +INCLUDEPATH += $$PWD/include +DEPENDPATH += $$PWD/include TEMPLATE = app diff --git a/src/rpg.pro.user b/src/rpg.pro.user deleted file mode 100644 index 5425e06..0000000 --- a/src/rpg.pro.user +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - EnvironmentId - {aee5e309-d8a7-48be-bef4-b52e0134ba55} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.4.0 MinGW 32bit - Desktop Qt 5.4.0 MinGW 32bit - qt.54.win32_mingw491_kit - 0 - 0 - 0 - - C:/Users/Rick/Documents/GitHub/rpg/build-rpg-Desktop_Qt_5_4_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/Rick/Documents/GitHub/rpg/build-rpg-Desktop_Qt_5_4_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - rpg - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Rick/Documents/GitHub/rpg/src/rpg.pro - - rpg.pro - false - true - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - -