From d7e2ee986bb9139a56476ab28c830f40057d42e3 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 19 May 2021 14:49:10 +0200 Subject: [PATCH] Add Network impl for PS4 --- Source/Engine/Platform/Network.h | 2 +- Source/Engine/Platform/Types.h | 4 ++-- Source/Engine/Platform/Unix/UnixNetwork.cpp | 2 +- Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Platform/Network.h b/Source/Engine/Platform/Network.h index d4802065b..cd35eb662 100644 --- a/Source/Engine/Platform/Network.h +++ b/Source/Engine/Platform/Network.h @@ -9,7 +9,7 @@ #elif PLATFORM_LINUX #include "Unix/UnixNetwork.h" #elif PLATFORM_PS4 -#include "Base/NetworkBase.h" +#include "Platforms/PS4/Engine/Platform/PS4Network.h" #elif PLATFORM_XBOX_SCARLETT #include "Win32/Win32Network.h" #elif PLATFORM_ANDROID diff --git a/Source/Engine/Platform/Types.h b/Source/Engine/Platform/Types.h index 71d85b4f3..f90be1129 100644 --- a/Source/Engine/Platform/Types.h +++ b/Source/Engine/Platform/Types.h @@ -91,8 +91,8 @@ class PS4Thread; typedef PS4Thread Thread; class PS4Window; typedef PS4Window Window; -class NetworkBase; -typedef NetworkBase Network; +class PS4Network; +typedef PS4Network Network; #elif PLATFORM_XBOX_SCARLETT diff --git a/Source/Engine/Platform/Unix/UnixNetwork.cpp b/Source/Engine/Platform/Unix/UnixNetwork.cpp index d37b07952..cc4f63df9 100644 --- a/Source/Engine/Platform/Unix/UnixNetwork.cpp +++ b/Source/Engine/Platform/Unix/UnixNetwork.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. -#if PLATFORM_UNIX +#if PLATFORM_UNIX && !PLATFORM_PS4 #include "UnixNetwork.h" #include "Engine/Core/Log.h" diff --git a/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp b/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp index a1420fd24..64abca055 100644 --- a/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp @@ -16,6 +16,9 @@ #include "Engine/Platform/Thread.h" #include "Engine/Scripting/MException.h" #include "Engine/Profiler/ProfilerCPU.h" +#ifdef USE_MONO_AOT_MODULE +#include "Engine/Core/Types/TimeSpan.h" +#endif #include #include #include