ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix include paths for bundled SFML 

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2025-07-18 01:30:16 +00:00
parent 53f5ec7b7d
commit 23a3d0b20f
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
72 changed files with 172 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/CMakeLists.txt
View File

@ -120,9 +120,7 @@ if(ENABLE_LINK)
gba/gbaLink.h gba/gbaLink.h
) )
target_include_directories(vbam-core target_include_directories(vbam-core PRIVATE ${SFML_INCLUDE_DIR} ${SFML_INCLUDE_DIR}/SFML/Network ${SFML_INCLUDE_DIR}/SFML/System)
PRIVATE ${SFML_INCLUDE_DIR}
)
target_link_libraries(vbam-core target_link_libraries(vbam-core
PRIVATE ${SFML_LIBRARIES} PRIVATE ${SFML_LIBRARIES}

2
src/core/gba/gbaLink.cpp
View File

@ -26,7 +26,7 @@
#include <cstring> #include <cstring>
#include <string> #include <string>
#include "SFML/Network.hpp" #include "../../../third_party/sfml/include/SFML/Network.hpp"
#include <libintl.h> #include <libintl.h>
#define _(x) gettext(x) #define _(x) gettext(x)

2
src/core/gba/internal/gbaSockClient.h
View File

@ -7,7 +7,7 @@
#include <cstdint> #include <cstdint>
#include "SFML/Network.hpp" #include "../../../../third_party/sfml/include/SFML/Network.hpp"
class GBASockClient { class GBASockClient {
public: public:

22
third_party/sfml/include/SFML/Network.hpp vendored
View File

@ -28,18 +28,18 @@
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Ftp.hpp> #include "../../SFML/Network/Ftp.hpp"
#include <SFML/Network/Http.hpp> #include "../../SFML/Network/Http.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../SFML/Network/IpAddress.hpp"
#include <SFML/Network/Packet.hpp> #include "../../SFML/Network/Packet.hpp"
#include <SFML/Network/Socket.hpp> #include "../../SFML/Network/Socket.hpp"
#include <SFML/Network/SocketHandle.hpp> #include "../../SFML/Network/SocketHandle.hpp"
#include <SFML/Network/SocketSelector.hpp> #include "../../SFML/Network/SocketSelector.hpp"
#include <SFML/Network/TcpListener.hpp> #include "../../SFML/Network/TcpListener.hpp"
#include <SFML/Network/TcpSocket.hpp> #include "../../SFML/Network/TcpSocket.hpp"
#include <SFML/Network/UdpSocket.hpp> #include "../../SFML/Network/UdpSocket.hpp"
#include <SFML/System.hpp> #include "../../SFML/System.hpp"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/Network/Export.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

6
third_party/sfml/include/SFML/Network/Ftp.hpp vendored
View File

@ -27,11 +27,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/TcpSocket.hpp> #include "../../SFML/Network/TcpSocket.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include "filesystem.hpp" #include "filesystem.hpp"
#include <string> #include <string>

8
third_party/sfml/include/SFML/Network/Http.hpp vendored
View File

@ -27,12 +27,12 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../SFML/Network/IpAddress.hpp"
#include <SFML/Network/TcpSocket.hpp> #include "../../SFML/Network/TcpSocket.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include <iosfwd> #include <iosfwd>
#include <map> #include <map>

4
third_party/sfml/include/SFML/Network/IpAddress.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include <iosfwd> #include <iosfwd>
#include "optional.hpp" #include "optional.hpp"

2
third_party/sfml/include/SFML/Network/Packet.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

4
third_party/sfml/include/SFML/Network/Socket.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/SocketHandle.hpp> #include "../../SFML/Network/SocketHandle.hpp"
namespace sf namespace sf

2
third_party/sfml/include/SFML/Network/SocketHandle.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
#include <basetsd.h> #include <basetsd.h>

4
third_party/sfml/include/SFML/Network/SocketSelector.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include <memory> #include <memory>

6
third_party/sfml/include/SFML/Network/TcpListener.hpp vendored
View File

@ -27,10 +27,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../SFML/Network/IpAddress.hpp"
#include <SFML/Network/Socket.hpp> #include "../../SFML/Network/Socket.hpp"
namespace sf namespace sf

6
third_party/sfml/include/SFML/Network/TcpSocket.hpp vendored
View File

@ -27,11 +27,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/Socket.hpp> #include "../../SFML/Network/Socket.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include "optional.hpp" #include "optional.hpp"
#include <vector> #include <vector>

6
third_party/sfml/include/SFML/Network/UdpSocket.hpp vendored
View File

@ -27,10 +27,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Export.hpp> #include "../../SFML/Network/Export.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../SFML/Network/IpAddress.hpp"
#include <SFML/Network/Socket.hpp> #include "../../SFML/Network/Socket.hpp"
#include <optional.hpp> #include <optional.hpp>
#include <vector> #include <vector>

28
third_party/sfml/include/SFML/System.hpp vendored
View File

@ -28,21 +28,21 @@
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#include <SFML/System/Angle.hpp> #include "../../SFML/System/Angle.hpp"
#include <SFML/System/Clock.hpp> #include "../../SFML/System/Clock.hpp"
#include <SFML/System/Err.hpp> #include "../../SFML/System/Err.hpp"
#include <SFML/System/Exception.hpp> #include "../../SFML/System/Exception.hpp"
#include <SFML/System/FileInputStream.hpp> #include "../../SFML/System/FileInputStream.hpp"
#include <SFML/System/InputStream.hpp> #include "../../SFML/System/InputStream.hpp"
#include <SFML/System/MemoryInputStream.hpp> #include "../../SFML/System/MemoryInputStream.hpp"
#include <SFML/System/Sleep.hpp> #include "../../SFML/System/Sleep.hpp"
#include <SFML/System/String.hpp> #include "../../SFML/System/String.hpp"
#include <SFML/System/Time.hpp> #include "../../SFML/System/Time.hpp"
#include <SFML/System/Utf.hpp> #include "../../SFML/System/Utf.hpp"
#include <SFML/System/Vector2.hpp> #include "../../SFML/System/Vector2.hpp"
#include <SFML/System/Vector3.hpp> #include "../../SFML/System/Vector3.hpp"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Angle.hpp vendored
View File

@ -472,7 +472,7 @@ namespace Literals
} // namespace Literals } // namespace Literals
} // namespace sf } // namespace sf
#include <SFML/System/Angle.inl> #include "../../SFML/System/Angle.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Angle.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Angle.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/Angle.hpp" // NOLINT(misc-header-include-cycle)
#include <cassert> #include <cassert>

4
third_party/sfml/include/SFML/System/Clock.hpp vendored
View File

@ -27,14 +27,14 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <chrono> #include <chrono>
#include <ratio> #include <ratio>
#include <type_traits> #include <type_traits>
#ifdef SFML_SYSTEM_ANDROID #ifdef SFML_SYSTEM_ANDROID
#include <SFML/System/SuspendAwareClock.hpp> #include "../../SFML/System/SuspendAwareClock.hpp"
#endif #endif

2
third_party/sfml/include/SFML/System/Err.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <iosfwd> #include <iosfwd>

2
third_party/sfml/include/SFML/System/Exception.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <stdexcept> #include <stdexcept>

2
third_party/sfml/include/SFML/System/Export.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

8
third_party/sfml/include/SFML/System/FileInputStream.hpp vendored
View File

@ -27,11 +27,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <SFML/System/InputStream.hpp> #include "../../SFML/System/InputStream.hpp"
#include "filesystem.hpp" #include "filesystem.hpp"
#include <memory> #include <memory>
@ -39,6 +39,8 @@
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
#include "optional.hpp"
#ifdef SFML_SYSTEM_ANDROID #ifdef SFML_SYSTEM_ANDROID
namespace sf namespace sf
{ {

4
third_party/sfml/include/SFML/System/InputStream.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include "optional.hpp" #include "optional.hpp"

7
third_party/sfml/include/SFML/System/MemoryInputStream.hpp vendored
View File

@ -27,15 +27,16 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <SFML/System/InputStream.hpp> #include "../../SFML/System/InputStream.hpp"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include "optional.hpp"
namespace sf namespace sf
{ {

2
third_party/sfml/include/SFML/System/NativeActivity.hpp vendored
View File

@ -28,7 +28,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#if !defined(SFML_SYSTEM_ANDROID) #if !defined(SFML_SYSTEM_ANDROID)

2
third_party/sfml/include/SFML/System/Sleep.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
namespace sf namespace sf

6
third_party/sfml/include/SFML/System/String.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <SFML/System/Utf.hpp> #include "../../SFML/System/Utf.hpp"
#include <locale> #include <locale>
#include <string> #include <string>
@ -647,7 +647,7 @@ private:
} // namespace sf } // namespace sf
#include <SFML/System/String.inl> #include "../../SFML/System/String.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/String.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/String.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/String.hpp" // NOLINT(misc-header-include-cycle)
#include <iterator> #include <iterator>

2
third_party/sfml/include/SFML/System/SuspendAwareClock.hpp vendored
View File

@ -28,7 +28,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <chrono> #include <chrono>

2
third_party/sfml/include/SFML/System/Time.hpp vendored
View File

@ -444,7 +444,7 @@ constexpr Time& operator%=(Time& left, Time right);
} // namespace sf } // namespace sf
#include <SFML/System/Time.inl> #include "../../SFML/System/Time.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Time.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Time.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/Time.hpp" // NOLINT(misc-header-include-cycle)
#include <ratio> #include <ratio>

4
third_party/sfml/include/SFML/System/Utf.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../SFML/Config.hpp"
#include <array> #include <array>
#include <locale> #include <locale>
@ -733,7 +733,7 @@ using Utf32 = Utf<32>;
} // namespace sf } // namespace sf
#include <SFML/System/Utf.inl> #include "../../SFML/System/Utf.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Utf.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Utf.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/Utf.hpp" // NOLINT(misc-header-include-cycle)
#include <iterator> #include <iterator>

6
third_party/sfml/include/SFML/System/Vector2.hpp vendored
View File

@ -24,9 +24,9 @@
#pragma once #pragma once
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
#include <SFML/System/Angle.hpp> #include "../../SFML/System/Angle.hpp"
namespace sf namespace sf
@ -382,7 +382,7 @@ template <typename T>
} // namespace sf } // namespace sf
#include <SFML/System/Vector2.inl> #include "../../SFML/System/Vector2.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Vector2.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Vector2.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/Vector2.hpp" // NOLINT(misc-header-include-cycle)
#include <cassert> #include <cassert>

4
third_party/sfml/include/SFML/System/Vector3.hpp vendored
View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <SFML/System/Export.hpp> #include "../../SFML/System/Export.hpp"
namespace sf namespace sf
@ -307,7 +307,7 @@ using Vector3f = Vector3<float>;
} // namespace sf } // namespace sf
#include <SFML/System/Vector3.inl> #include "../../SFML/System/Vector3.inl"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

2
third_party/sfml/include/SFML/System/Vector3.inl vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Vector3.hpp> // NOLINT(misc-header-include-cycle) #include "../../SFML/System/Vector3.hpp" // NOLINT(misc-header-include-cycle)
#include <cassert> #include <cassert>

3
third_party/sfml/src/SFML/Network/CMakeLists.txt vendored
View File

@ -47,7 +47,8 @@ source_group("" FILES ${SRC})
# define the sfml-network target # define the sfml-network target
add_library(sfml-network ${SRC}) add_library(sfml-network ${SRC})
target_include_directories(sfml-network SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../include) target_include_directories(sfml-network SYSTEM BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
target_include_directories(sfml-network PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../..)
target_compile_definitions(sfml-network PRIVATE SFML_STATIC) target_compile_definitions(sfml-network PRIVATE SFML_STATIC)
target_compile_definitions(sfml-network INTERFACE SFML_STATIC) target_compile_definitions(sfml-network INTERFACE SFML_STATIC)

6
third_party/sfml/src/SFML/Network/Ftp.cpp vendored
View File

@ -25,10 +25,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Ftp.hpp> #include "../../../include/SFML/Network/Ftp.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../../include/SFML/Network/IpAddress.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <algorithm> #include <algorithm>
#include <array> #include <array>

6
third_party/sfml/src/SFML/Network/Http.cpp vendored
View File

@ -25,10 +25,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Http.hpp> #include "../../../include/SFML/Network/Http.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <SFML/System/Utils.hpp> #include "../../SFML/System/Utils.hpp"
#include <algorithm> #include <algorithm>
#include <array> #include <array>

8
third_party/sfml/src/SFML/Network/IpAddress.cpp vendored
View File

@ -25,11 +25,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Http.hpp> #include "../../../include/SFML/Network/Http.hpp"
#include <SFML/Network/IpAddress.hpp> #include "../../../include/SFML/Network/IpAddress.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <istream> #include <istream>
#include <ostream> #include <ostream>

8
third_party/sfml/src/SFML/Network/Packet.cpp vendored
View File

@ -25,11 +25,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Packet.hpp> #include "../../../include/SFML/Network/Packet.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/System/String.hpp> #include "../../../include/SFML/System/String.hpp"
#include <SFML/System/Utils.hpp> #include "../../SFML/System/Utils.hpp"
#include <array> #include <array>

6
third_party/sfml/src/SFML/Network/Socket.cpp vendored
View File

@ -25,10 +25,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Socket.hpp> #include "../../../include/SFML/Network/Socket.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <ostream> #include <ostream>
#include <utility> #include <utility>

6
third_party/sfml/src/SFML/Network/SocketImpl.hpp vendored
View File

@ -27,12 +27,12 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Socket.hpp> #include "../../../include/SFML/Network/Socket.hpp"
#include <SFML/Network/SocketHandle.hpp> #include "../../../include/SFML/Network/SocketHandle.hpp"
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
#include <SFML/System/Win32/WindowsHeader.hpp> #include "../../../include/SFML/System/Win32/WindowsHeader.hpp"
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>

8
third_party/sfml/src/SFML/Network/SocketSelector.cpp vendored
View File

@ -25,11 +25,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/Socket.hpp> #include "../../../include/SFML/Network/Socket.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/Network/SocketSelector.hpp> #include "../../../include/SFML/Network/SocketSelector.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>

8
third_party/sfml/src/SFML/Network/TcpListener.cpp vendored
View File

@ -25,11 +25,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/Network/TcpListener.hpp> #include "../../../include/SFML/Network/TcpListener.hpp"
#include <SFML/Network/TcpSocket.hpp> #include "../../../include/SFML/Network/TcpSocket.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <ostream> #include <ostream>

10
third_party/sfml/src/SFML/Network/TcpSocket.cpp vendored
View File

@ -25,12 +25,12 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/IpAddress.hpp> #include "../../../include/SFML/Network/IpAddress.hpp"
#include <SFML/Network/Packet.hpp> #include "../../../include/SFML/Network/Packet.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/Network/TcpSocket.hpp> #include "../../../include/SFML/Network/TcpSocket.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <algorithm> #include <algorithm>
#include <array> #include <array>

10
third_party/sfml/src/SFML/Network/UdpSocket.cpp vendored
View File

@ -25,12 +25,12 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/IpAddress.hpp> #include "../../../include/SFML/Network/IpAddress.hpp"
#include <SFML/Network/Packet.hpp> #include "../../../include/SFML/Network/Packet.hpp"
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <SFML/Network/UdpSocket.hpp> #include "../../../include/SFML/Network/UdpSocket.hpp"
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <ostream> #include <ostream>

4
third_party/sfml/src/SFML/Network/Unix/SocketImpl.cpp vendored
View File

@ -25,9 +25,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/SocketImpl.hpp> #include "../SocketImpl.hpp"
#include <SFML/System/Err.hpp> #include "../../../../include/SFML/System/Err.hpp"
#include <fcntl.h> #include <fcntl.h>
#include <ostream> #include <ostream>

2
third_party/sfml/src/SFML/Network/Win32/SocketImpl.cpp vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Network/SocketImpl.hpp> #include "../../SFML/Network/SocketImpl.hpp"
#include <cstdint> #include <cstdint>

2
third_party/sfml/src/SFML/System/Android/Activity.cpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Android/Activity.hpp> #include "../../../include/SFML/System/Android/Activity.hpp"
#include <android/log.h> #include <android/log.h>

6
third_party/sfml/src/SFML/System/Android/Activity.hpp vendored
View File

@ -27,10 +27,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Window/EglContext.hpp> #include "../../../include/SFML/Window/EglContext.hpp"
#include <SFML/Window/Event.hpp> #include "../../../include/SFML/Window/Event.hpp"
#include <SFML/System/EnumArray.hpp> #include "../../../include/SFML/System/EnumArray.hpp"
#include <android/configuration.h> #include <android/configuration.h>
#include <android/native_activity.h> #include <android/native_activity.h>

4
third_party/sfml/src/SFML/System/Android/NativeActivity.cpp vendored
View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Android/Activity.hpp> #include "../../../include/SFML/System/Android/Activity.hpp"
#include <SFML/System/NativeActivity.hpp> #include "../../../include/SFML/System/NativeActivity.hpp"
namespace sf namespace sf
{ {

4
third_party/sfml/src/SFML/System/Android/ResourceStream.cpp vendored
View File

@ -26,8 +26,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Android/Activity.hpp> #include "../../../include/SFML/System/Android/Activity.hpp"
#include <SFML/System/Android/ResourceStream.hpp> #include "../../../include/SFML/System/Android/ResourceStream.hpp"
#include <mutex> #include <mutex>

4
third_party/sfml/src/SFML/System/Android/ResourceStream.hpp vendored
View File

@ -27,9 +27,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../../include/SFML/System/Export.hpp"
#include <SFML/System/InputStream.hpp> #include "../../../include/SFML/System/InputStream.hpp"
#include <android/asset_manager.h> #include <android/asset_manager.h>

2
third_party/sfml/src/SFML/System/Android/SuspendAwareClock.cpp vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/SuspendAwareClock.hpp> #include "../../../include/SFML/System/SuspendAwareClock.hpp"
#include <ctime> #include <ctime>

3
third_party/sfml/src/SFML/System/CMakeLists.txt vendored
View File

@ -73,7 +73,8 @@ endif()
# define the sfml-system target # define the sfml-system target
add_library(sfml-system STATIC ${SRC} ${PLATFORM_SRC}) add_library(sfml-system STATIC ${SRC} ${PLATFORM_SRC})
target_include_directories(sfml-system SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../include) target_include_directories(sfml-system SYSTEM BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
target_include_directories(sfml-system PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../..)
target_compile_definitions(sfml-system PRIVATE SFML_STATIC) target_compile_definitions(sfml-system PRIVATE SFML_STATIC)
target_compile_definitions(sfml-system INTERFACE SFML_STATIC) target_compile_definitions(sfml-system INTERFACE SFML_STATIC)

4
third_party/sfml/src/SFML/System/Clock.cpp vendored
View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Clock.hpp> #include "../../../include/SFML/System/Clock.hpp"
#include <SFML/System/Time.hpp> #include "../../../include/SFML/System/Time.hpp"
namespace sf namespace sf

2
third_party/sfml/src/SFML/System/Err.cpp vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Err.hpp> #include "../../../include/SFML/System/Err.hpp"
#include <iostream> #include <iostream>
#include <streambuf> #include <streambuf>

12
third_party/sfml/src/SFML/System/FileInputStream.cpp vendored
View File

@ -25,19 +25,17 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Exception.hpp> #include "../../../include/SFML/System/Exception.hpp"
#include <SFML/System/FileInputStream.hpp> #include "../../../include/SFML/System/FileInputStream.hpp"
#include <SFML/System/Utils.hpp> #include "../../SFML/System/Utils.hpp"
#ifdef SFML_SYSTEM_ANDROID #ifdef SFML_SYSTEM_ANDROID
#include <SFML/System/Android/Activity.hpp> #include "../../../include/SFML/System/Android/Activity.hpp"
#include <SFML/System/Android/ResourceStream.hpp> #include "../../../include/SFML/System/Android/ResourceStream.hpp"
#endif #endif
#include <memory> #include <memory>
#include <cstddef> #include <cstddef>
#include "optional.hpp"
namespace sf namespace sf
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

4
third_party/sfml/src/SFML/System/MemoryInputStream.cpp vendored
View File

@ -25,15 +25,13 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/MemoryInputStream.hpp> #include "../../../include/SFML/System/MemoryInputStream.hpp"
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include "optional.hpp"
namespace sf namespace sf
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

8
third_party/sfml/src/SFML/System/Sleep.cpp vendored
View File

@ -25,13 +25,13 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Sleep.hpp> #include "../../../include/SFML/System/Sleep.hpp"
#include <SFML/System/Time.hpp> #include "../../../include/SFML/System/Time.hpp"
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
#include <SFML/System/Win32/SleepImpl.hpp> #include "Win32/SleepImpl.hpp"
#else #else
#include <SFML/System/Unix/SleepImpl.hpp> #include "Unix/SleepImpl.hpp"
#endif #endif

4
third_party/sfml/src/SFML/System/String.cpp vendored
View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/String.hpp> #include "../../../include/SFML/System/String.hpp"
#include <SFML/System/Utf.hpp> #include "../../../include/SFML/System/Utf.hpp"
#include <iterator> #include <iterator>
#include <utility> #include <utility>

4
third_party/sfml/src/SFML/System/Unix/SleepImpl.cpp vendored
View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Time.hpp> #include "../../../../include/SFML/System/Time.hpp"
#include <SFML/System/Unix/SleepImpl.hpp> #include "SleepImpl.hpp"
#include <cerrno> #include <cerrno>
#include <ctime> #include <ctime>

2
third_party/sfml/src/SFML/System/Unix/SleepImpl.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../../../include/SFML/Config.hpp"
namespace sf namespace sf

2
third_party/sfml/src/SFML/System/Utils.cpp vendored
View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Utils.hpp> #include "../../SFML/System/Utils.hpp"
#include <array> #include <array>
#include <sstream> #include <sstream>

2
third_party/sfml/src/SFML/System/Utils.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Export.hpp> #include "../../../include/SFML/System/Export.hpp"
#include <array> #include <array>
#include "filesystem.hpp" #include "filesystem.hpp"

2
third_party/sfml/src/SFML/System/Vector2.cpp vendored
View File

@ -22,7 +22,7 @@
// //
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Vector2.hpp> #include "../../../include/SFML/System/Vector2.hpp"
#include <type_traits> #include <type_traits>

2
third_party/sfml/src/SFML/System/Vector3.cpp vendored
View File

@ -22,7 +22,7 @@
// //
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Vector3.hpp> #include "../../../include/SFML/System/Vector3.hpp"
#include <type_traits> #include <type_traits>

6
third_party/sfml/src/SFML/System/Win32/SleepImpl.cpp vendored
View File

@ -25,9 +25,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Time.hpp> #include "../../../include/SFML/System/Time.hpp"
#include <SFML/System/Win32/SleepImpl.hpp> #include "../../../include/SFML/System/Win32/SleepImpl.hpp"
#include <SFML/System/Win32/WindowsHeader.hpp> #include "../../../include/SFML/System/Win32/WindowsHeader.hpp"
#include <mmsystem.h> #include <mmsystem.h>

2
third_party/sfml/src/SFML/System/Win32/SleepImpl.hpp vendored
View File

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include "../../../include/SFML/Config.hpp"
namespace sf namespace sf
{ {