From 71f020f54030e37618b5ec014993ec4dbf977708 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Tue, 21 Jun 2022 14:10:09 +0200 Subject: [PATCH] Fixes for console builds --- .../EpicOnlineServices/Source/Core/Config.cs | 20 ++++++++++++++++++- .../Source/Generated/Bindings.cs | 11 +++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Assets/Plugins/EpicOnlineServices/Source/Core/Config.cs b/Assets/Plugins/EpicOnlineServices/Source/Core/Config.cs index cc8143e..5219f3b 100644 --- a/Assets/Plugins/EpicOnlineServices/Source/Core/Config.cs +++ b/Assets/Plugins/EpicOnlineServices/Source/Core/Config.cs @@ -8,7 +8,7 @@ #define EOS_EDITOR #endif -#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID +#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID || UNITY_PS5 || UNITY_GAMECORE #define EOS_UNITY #endif @@ -40,6 +40,15 @@ #elif UNITY_ANDROID || __ANDROID__ #define EOS_PLATFORM_ANDROID +#elif UNITY_PS5 + #define EOS_PLATFORM_PS5 + +#elif UNITY_GAMECORE_XBOXONE + #define EOS_PLATFORM_XBOXONE_GDK + +#elif UNITY_GAMECORE_SCARLETT + #define EOS_PLATFORM_XBOXSERIESX + #endif using System.Runtime.InteropServices; @@ -76,6 +85,15 @@ namespace Epic.OnlineServices #elif EOS_PLATFORM_ANDROID "EOSSDK" + + #elif EOS_PLATFORM_PS4 + "EOSSDK-PS4-Shipping" + #elif EOS_PLATFORM_PS5 + "EOSSDK-PS5-Shipping" + #elif EOS_PLATFORM_XBOXONE_GDK + "EOSSDK-XboxOneGDK-Shipping.dll" + #elif EOS_PLATFORM_XBOXSERIESX + "EOSSDK-XSX-Shipping.dll" #else #error Unable to determine the name of the EOSSDK library. Ensure you have set the correct EOS compilation symbol for the current platform, such as EOS_PLATFORM_WINDOWS_32 or EOS_PLATFORM_WINDOWS_64, so that the correct EOSSDK library can be targeted. diff --git a/Assets/Plugins/EpicOnlineServices/Source/Generated/Bindings.cs b/Assets/Plugins/EpicOnlineServices/Source/Generated/Bindings.cs index ef620ad..be625c9 100644 --- a/Assets/Plugins/EpicOnlineServices/Source/Generated/Bindings.cs +++ b/Assets/Plugins/EpicOnlineServices/Source/Generated/Bindings.cs @@ -9,7 +9,7 @@ #define EOS_EDITOR #endif -#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID +#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID || UNITY_PS5 || UNITY_GAMECORE #define EOS_UNITY #endif @@ -40,6 +40,15 @@ #elif UNITY_ANDROID || __ANDROID__ #define EOS_PLATFORM_ANDROID + +#elif UNITY_PS5 + #define EOS_PLATFORM_PS5 + +#elif UNITY_GAMECORE_XBOXONE + #define EOS_PLATFORM_XBOXONE_GDK + +#elif UNITY_GAMECORE_SCARLETT + #define EOS_PLATFORM_XBOXSERIESX #endif