Skip to content

Commit 97a8191

Browse files
committed
Update Config.cs
1 parent 358dd33 commit 97a8191

File tree

1 file changed

+59
-36
lines changed
  • com.playeveryware.eos/Runtime/EOS_SDK/Core

1 file changed

+59
-36
lines changed

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

Lines changed: 59 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
#define EOS_EDITOR
99
#endif
1010

11-
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID
12-
#define EOS_UNITY
11+
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_PS5 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID || UNITY_WSA
12+
#define EOS_UNITY
1313
#endif
1414

15-
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS
16-
#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
17-
#define EOS_PLATFORM_WINDOWS_64
18-
#else
19-
#define EOS_PLATFORM_WINDOWS_32
20-
#endif
15+
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS || UNITY_WSA
16+
#if UNITY_EDITOR_WIN || UNITY_64 || UNITY_EDITOR_64 || PLATFORM_64BITS || UNITY_WSA
17+
#define EOS_PLATFORM_WINDOWS_64
18+
#else
19+
#define EOS_PLATFORM_WINDOWS_32
20+
#endif
2121

2222
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
2323
#define EOS_PLATFORM_OSX
@@ -28,6 +28,14 @@
2828
#elif UNITY_PS4
2929
#define EOS_PLATFORM_PS4
3030

31+
#elif UNITY_PS5
32+
#define EOS_PLATFORM_PS5
33+
34+
#elif UNITY_GAMECORE_XBOXONE
35+
#define EOS_PLATFORM_XBOXONE_GDK
36+
37+
#elif UNITY_GAMECORE_SCARLETT
38+
#define EOS_PLATFORM_XSX
3139
#elif UNITY_XBOXONE
3240
#define EOS_PLATFORM_XBOXONE
3341

@@ -54,57 +62,72 @@ namespace Epic.OnlineServices
5462
// platform support.
5563
public static partial class Config
5664
{
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
65+
// This conditional (added by PlayEveryWare) is here (in conjunction with
66+
// the class it is contained within being marked as "partial") so that
67+
// other platforms can be supported by adding to this code-base another
68+
// part of the partial class that sets the LibraryName differently
69+
// depending on the presence of other scripting defines that indicate
70+
// available functionality on other platforms.
71+
#if EOS_PLATFORM_WINDOWS_32 || EOS_PLATFORM_WINDOWS_64 || EOS_PLATFORM_OSX || EOS_PLATFORM_LINUX || EOS_PLATFORM_IOS || EOS_PLATFORM_ANDROID
6472
public const string LibraryName =
65-
#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
73+
#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
6674
"EOSSDK-Win32-Shipping"
67-
#elif EOS_PLATFORM_WINDOWS_32
75+
#elif EOS_PLATFORM_WINDOWS_32
6876
"EOSSDK-Win32-Shipping.dll"
6977

70-
#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
78+
#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
7179
"EOSSDK-Win64-Shipping"
72-
#elif EOS_PLATFORM_WINDOWS_64
80+
#elif EOS_PLATFORM_WINDOWS_64
7381
"EOSSDK-Win64-Shipping.dll"
7482

75-
#elif EOS_PLATFORM_OSX && EOS_UNITY
83+
#elif EOS_PLATFORM_OSX && EOS_UNITY
7684
"libEOSSDK-Mac-Shipping"
77-
#elif EOS_PLATFORM_OSX
85+
#elif EOS_PLATFORM_OSX
7886
"libEOSSDK-Mac-Shipping.dylib"
7987

80-
#elif EOS_PLATFORM_LINUX && EOS_UNITY
88+
#elif EOS_PLATFORM_LINUX && EOS_UNITY
8189
"libEOSSDK-Linux-Shipping"
82-
#elif EOS_PLATFORM_LINUX
90+
#elif EOS_PLATFORM_LINUX
8391
"libEOSSDK-Linux-Shipping.so"
8492

85-
#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
93+
#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
8694
"EOSSDK"
87-
#elif EOS_PLATFORM_IOS
95+
#elif EOS_PLATFORM_IOS
8896
"EOSSDK.framework/EOSSDK"
8997

90-
#elif EOS_PLATFORM_ANDROID
98+
#elif EOS_PLATFORM_ANDROID
9199
"EOSSDK"
92100

101+
#elif EOS_PLATFORM_PS4
102+
#if EOS_PLATFORM_PS4_CROSSGEN
103+
"EOSSDKCrossgen-PS4-Shipping.prx"
104+
#else
105+
"EOSSDK-PS4-Shipping.prx"
106+
#endif
107+
#elif EOS_PLATFORM_PS5
108+
"EOSSDK-PS5-Shipping.prx"
109+
110+
#elif EOS_PLATFORM_SWITCH
111+
"EOSSDK-Switch-Shipping"
112+
113+
#elif EOS_PLATFORM_XBOXONE_GDK
114+
"EOSSDK-XboxOneGDK-Shipping"
115+
116+
#elif EOS_PLATFORM_XSX
117+
"EOSSDK-XSX-Shipping"
118+
119+
#elif EOS_DISABLE
120+
#warning Disabling EOS
121+
93122
#else
94123
#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.
95124
"EOSSDK-UnknownPlatform-Shipping"
96125

97-
#endif
126+
#endif
98127
;
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 =
128+
#endif
129+
// PEW: End modify
130+
public const CallingConvention LibraryCallingConvention =
108131
#if EOS_PLATFORM_WINDOWS_32
109132
CallingConvention.StdCall
110133
#else

0 commit comments

Comments
 (0)