sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split engine to packages NazaraUtils and NZSL (#375)

Browse Source 
* Move code to NazaraUtils and NZSL packages

* Reorder includes

* Tests: Remove glslang and spirv-tools deps

* Tests: Remove glslang init

* Remove NazaraUtils tests and fix Vector4Test

* Fix Linux compilation

* Update msys2-build.yml

* Fix assimp package

* Update xmake.lua

* Update xmake.lua

* Fix shader compilation on MinGW

* Final fixes

* The final fix 2: the fix strikes back!

* Disable cache on CI

* The return of the fix™️
This commit is contained in:
Jérôme Leclercq
2022-05-25 19:36:10 +02:00
committed by GitHub
parent 3f8f1c4653
commit 03e2801dbe
483 changed files with 1139 additions and 59112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Network/ENetHost.cpp
View File

@@ -13,10 +13,11 @@
*/
#include <Nazara/Network/ENetHost.hpp>
#include <Nazara/Core/OffsetOf.hpp>
#include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Network/Algorithm.hpp>
#include <Nazara/Network/ENetPeer.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <Nazara/Utils/OffsetOf.hpp>
#include <Nazara/Network/Debug.hpp>
namespace Nz

2
src/Nazara/Network/ENetPacket.cpp
View File

@@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Network/ENetPacket.hpp>
#include <Nazara/Core/MemoryPool.hpp>
#include <Nazara/Utils/MemoryPool.hpp>
#include <Nazara/Network/Debug.hpp>
namespace Nz

2
src/Nazara/Network/Network.cpp
View File

@@ -3,12 +3,12 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Network/Network.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Network/Config.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <Nazara/Utils/CallOnExit.hpp>
#if defined(NAZARA_PLATFORM_WINDOWS)
#include <Nazara/Network/Win32/SocketImpl.hpp>

2
src/Nazara/Network/Posix/IpAddressImpl.cpp
View File

@@ -4,10 +4,10 @@
#include <Nazara/Network/Posix/IpAddressImpl.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/Posix/SocketImpl.hpp>
#include <Nazara/Utils/CallOnExit.hpp>
#include <cstring>
#include <Nazara/Network/Debug.hpp>

2
src/Nazara/Network/Posix/SocketImpl.cpp
View File

@@ -5,11 +5,11 @@
#include <Nazara/Network/Posix/SocketImpl.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StackArray.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/Algorithm.hpp>
#include <Nazara/Network/NetBuffer.hpp>
#include <Nazara/Network/Posix/IpAddressImpl.hpp>
#include <Nazara/Utils/StackArray.hpp>
#include <cstring>
#include <poll.h>
#include <unistd.h>

4
src/Nazara/Network/SystemSocket.hpp
View File

@@ -5,8 +5,8 @@
// no header guards
#ifdef NAZARA_PLATFORM_WINDOWS
#include <winsock2.h>
#include <ws2tcpip.h>
#include <WS2tcpip.h>
#include <WinSock2.h>
#elif defined(NAZARA_PLATFORM_POSIX)
#include <sys/socket.h>
#endif

2
src/Nazara/Network/TcpClient.cpp
View File

@@ -3,10 +3,10 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Network/TcpClient.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <Nazara/Utils/CallOnExit.hpp>
#include <limits>
#if defined(NAZARA_PLATFORM_WINDOWS)

6
src/Nazara/Network/Win32/IpAddressImpl.cpp
View File

@@ -4,10 +4,10 @@
#include <Nazara/Network/Win32/IpAddressImpl.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/Win32/SocketImpl.hpp>
#include <Nazara/Utils/CallOnExit.hpp>
#include <cstring>
#include <Nazara/Network/Debug.hpp>
@@ -24,7 +24,7 @@ namespace Nz
{
namespace Detail
{
#if NAZARA_CORE_WINDOWS_NT6
#if NAZARA_UTILS_WINDOWS_NT6
using addrinfoImpl = addrinfoW;
int GetAddressInfo(const std::string& hostname, const std::string& service, const addrinfoImpl* hints, addrinfoImpl** results)
@@ -119,7 +119,7 @@ namespace Nz
return IpAddress::Invalid;
}
#if NAZARA_CORE_WINDOWS_NT6
#if NAZARA_UTILS_WINDOWS_NT6
IpAddress IpAddressImpl::FromAddrinfo(const addrinfoW* info)
{
switch (info->ai_family)

6
src/Nazara/Network/Win32/IpAddressImpl.hpp
View File

@@ -8,8 +8,8 @@
#define NAZARA_NETWORK_WIN32_IPADDRESSIMPL_HPP
#include <Nazara/Network/IpAddress.hpp>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <WS2tcpip.h>
#include <WinSock2.h>
#include <string>
namespace Nz
@@ -23,7 +23,7 @@ namespace Nz
~IpAddressImpl() = delete;
static IpAddress FromAddrinfo(const addrinfo* info);
#if NAZARA_CORE_WINDOWS_NT6
#if NAZARA_UTILS_WINDOWS_NT6
static IpAddress FromAddrinfo(const addrinfoW* info);
#endif
static IpAddress FromSockAddr(const sockaddr* address);

6
src/Nazara/Network/Win32/SocketImpl.cpp
View File

@@ -6,9 +6,9 @@
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Core/StackArray.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Network/Win32/IpAddressImpl.hpp>
#include <Nazara/Utils/StackArray.hpp>
// Some compilers (older versions of MinGW) lack Mstcpip.h which defines some structs/defines
#if defined(__has_include)
@@ -31,8 +31,6 @@ struct tcp_keepalive
#define SIO_KEEPALIVE_VALS _WSAIOW(IOC_VENDOR,4)
#endif
#include <WinSock2.h>
#include <Nazara/Network/Debug.hpp>
namespace Nz
@@ -824,7 +822,7 @@ namespace Nz
bool SocketImpl::SetIPv6Only(SocketHandle handle, bool ipv6Only, SocketError* error)
{
#if NAZARA_CORE_WINDOWS_NT6
#if NAZARA_UTILS_WINDOWS_NT6
NazaraAssert(handle != InvalidHandle, "Invalid handle");
DWORD option = ipv6Only;

4
src/Nazara/Network/Win32/SocketImpl.hpp
View File

@@ -11,9 +11,9 @@
#include <Nazara/Network/IpAddress.hpp>
#include <Nazara/Network/NetBuffer.hpp>
#include <Nazara/Network/SocketHandle.hpp>
#include <winsock2.h>
#include <WinSock2.h>
#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_NT6
#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_UTILS_WINDOWS_NT6
namespace Nz
{

2
src/Nazara/Network/Win32/SocketPollerImpl.hpp
View File

@@ -10,7 +10,7 @@
#include <Nazara/Network/IpAddress.hpp>
#include <Nazara/Network/SocketHandle.hpp>
#include <Nazara/Network/Win32/SocketImpl.hpp>
#include <winsock2.h>
#include <WinSock2.h>
#include <unordered_map>
#include <unordered_set>
#include <vector>