Skip to content

Commit 962fee0

Browse files
JessTelloJessTello
committed
Update EOS 1.17.0 CL 41373641
1 parent 0f572e5 commit 962fee0

File tree

10 files changed

+34
-72
lines changed

10 files changed

+34
-72
lines changed

‎Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f93accfc264dfcf533de33ec7561acaaeb64f489e4143a60d07b4b3a390a272d
3-
size 28487160
2+
oid sha256:5d06b940d1d67736db2df3ce81520424b55b1fc0924bfc2f88ef7c06dc3c8a5c
3+
size 28493432

‎Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b0591a96e7daa4a1031fff1fc1ff4332285e1d38d9676c33ab32d9da2ff8f765
3-
size 18266584
2+
oid sha256:47261706ef55eca3df8ff2fef22937c77c7e1cc8e98f3171a8562c47005d781b
3+
size 18235920

‎Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:bc3750de00a87cdbea01285ba3c4ab46cdc92dbea134638f5de6982bad61a092
3-
size 14011864
2+
oid sha256:bfb79a75e72454b68f5d546e833936cb4c74804d67f58e1af232a49a425aa697
3+
size 14016528

‎Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:833afa39d22dd170bcb4c0fe9774f315d62b4bf9c7682fa5a68a3f9bf6e7b75e
3-
size 45918384
2+
oid sha256:efd868245d2a7c10b3d31433e52669d976bd4d7f83cf67c527681d6a836a0d45
3+
size 44212608

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/Config.cs‎

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,65 +46,45 @@
4646

4747
namespace Epic.OnlineServices
4848
{
49-
// PEW: Start Modify
50-
// The partial attribute (added by PlayEveryWare) is the least intrusive
51-
// means by which the following class can be expanded to support additional
52-
// platforms. By making the class partial, supplementary partial
53-
// class definition files can be added to the codebase that will expand
54-
// platform support.
55-
public static partial class Config
49+
public static class Config
5650
{
57-
// This conditional (added by PlayEveryWare) is here (in conjunction with
58-
// the class it is contained within being marked as "partial") so that
59-
// other platforms can be supported by adding to this code-base another
60-
// part of the partial class that sets the LibraryName differently
61-
// depending on the presence of other scripting defines that indicate
62-
// available functionality on other platforms.
63-
#if EOS_PLATFORM_WINDOWS_32 || EOS_PLATFORM_WINDOWS_64 || EOS_PLATFORM_OSX || EOS_PLATFORM_LINUX || EOS_PLATFORM_IOS || EOS_PLATFORM_ANDROID
6451
public const string LibraryName =
65-
#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
52+
#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
6653
"EOSSDK-Win32-Shipping"
67-
#elif EOS_PLATFORM_WINDOWS_32
54+
#elif EOS_PLATFORM_WINDOWS_32
6855
"EOSSDK-Win32-Shipping.dll"
6956

70-
#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
57+
#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
7158
"EOSSDK-Win64-Shipping"
72-
#elif EOS_PLATFORM_WINDOWS_64
59+
#elif EOS_PLATFORM_WINDOWS_64
7360
"EOSSDK-Win64-Shipping.dll"
7461

75-
#elif EOS_PLATFORM_OSX && EOS_UNITY
62+
#elif EOS_PLATFORM_OSX && EOS_UNITY
7663
"libEOSSDK-Mac-Shipping"
77-
#elif EOS_PLATFORM_OSX
64+
#elif EOS_PLATFORM_OSX
7865
"libEOSSDK-Mac-Shipping.dylib"
7966

80-
#elif EOS_PLATFORM_LINUX && EOS_UNITY
67+
#elif EOS_PLATFORM_LINUX && EOS_UNITY
8168
"libEOSSDK-Linux-Shipping"
82-
#elif EOS_PLATFORM_LINUX
69+
#elif EOS_PLATFORM_LINUX
8370
"libEOSSDK-Linux-Shipping.so"
8471

85-
#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
72+
#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
8673
"EOSSDK"
87-
#elif EOS_PLATFORM_IOS
74+
#elif EOS_PLATFORM_IOS
8875
"EOSSDK.framework/EOSSDK"
8976

90-
#elif EOS_PLATFORM_ANDROID
77+
#elif EOS_PLATFORM_ANDROID
9178
"EOSSDK"
9279

93-
#else
94-
#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.
80+
#else
81+
#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.
9582
"EOSSDK-UnknownPlatform-Shipping"
9683

97-
#endif
84+
#endif
9885
;
99-
#elif EXTERNAL_TO_UNITY
100-
#if PLATFORM_64
101-
public const string LibraryName = "EOSSDK-Win64-Shipping.dll";
102-
#else
103-
public const string LibraryName = "EOSSDK-Win32-Shipping.dll";
104-
#endif
105-
#endif
106-
// PEW: End modify
107-
public const CallingConvention LibraryCallingConvention =
86+
87+
public const CallingConvention LibraryCallingConvention =
10888
#if EOS_PLATFORM_WINDOWS_32
10989
CallingConvention.StdCall
11090
#else

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/Helper.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,6 @@ private static IntPtr AddPinnedBuffer(Utf8String str)
630630
return AddPinnedBuffer(str.Bytes, 0);
631631
}
632632

633-
// PEW: Start Modify
634-
// This function is added because this file is included in a class
635-
// library with a lower supported version of C# that does not allow a
636-
// byte array to be automatically converted into an ArraySegment
637-
internal static IntPtr AddPinnedBuffer(byte[] array)
638-
{
639-
return array == null ? IntPtr.Zero : AddPinnedBuffer(new ArraySegment<byte>(array));
640-
}
641-
// PEW: End Modify
642-
643633
internal static IntPtr AddPinnedBuffer(ArraySegment<byte> array)
644634
{
645635
if (array == null)

‎com.playeveryware.eos/Runtime/EOS_SDK/Generated/ContinuanceToken.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,7 @@ public ContinuanceToken(System.IntPtr innerHandle) : base(innerHandle)
3636
public Result ToString(out Utf8String outBuffer)
3737
{
3838
int inOutBufferLength = 1024;
39-
40-
// PEW: Start modify
41-
// NOTES:
42-
//
43-
// The changes below are implemented temporarily by PEW to correct
44-
// an issue where the inOutBufferLength is not properly determined.
45-
//
46-
// Until this is resolved from Epic - these changes will need to
47-
// be maintained after the import of a new version of the EOS SDK.
48-
49-
// Call the EOS_ContinuanceToken_ToString function will a null buffer address to determine the correct buffer length.
50-
// Discard the result of this call because it is not relevant.
51-
_ = Bindings.EOS_ContinuanceToken_ToString(InnerHandle, System.IntPtr.Zero, ref inOutBufferLength);
5239
System.IntPtr outBufferAddress = Helper.AddAllocation(inOutBufferLength);
53-
// PEW: End modify
5440

5541
var funcResult = Bindings.EOS_ContinuanceToken_ToString(InnerHandle, outBufferAddress, ref inOutBufferLength);
5642

‎com.playeveryware.eos/Runtime/EOS_SDK/Generated/Types/OnlinePlatform.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ public sealed partial class OnlinePlatform
77
{
88
public const int OptEpic = 100;
99

10+
public const int OptNintendo = 2000;
11+
12+
public const int OptPsn = 1000;
13+
1014
public const int OptSteam = 4000;
1115

1216
/// <summary>
1317
/// This type is used to distinguish between different online platforms.
1418
/// </summary>
1519
public const int OptUnknown = 0;
20+
21+
public const int OptXbl = 3000;
1622
}
1723
}

‎tools/bin/EOSBootstrapper.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:87bfd7ed2334fd1dab0e1cc9a0fe3cc53afbc29d8ba4a602dba633a533fa8ccf
2+
oid sha256:525dc1c50945fbe0a6653118c9b09908e31927553c973ca1f1557413b959c2af
33
size 2632704

‎tools/bin/EOSBootstrapperTool.exe‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6bead8900ab1644bfb818843c47a2cd90446a4df7ce0e54e980cfb1279bd4702
3-
size 5288408
2+
oid sha256:f1d0aee6ea9a46754aee5fae2c223eb44b7b51875e29539e56d99378bffef5ce
3+
size 5288464

0 commit comments

Comments
 (0)