Skip to content

Commit e3bad49

Browse files
Revert "Reimplement Mac EAC Settings fix and remove legacy config file"
This reverts commit 2d94a5a.
1 parent ce5dd27 commit e3bad49

File tree

3 files changed

+140
-1
lines changed

3 files changed

+140
-1
lines changed

PlatformSpecificAssets~/EOS/Mac/EasyAntiCheat/Settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title" : "<ProductName>",
3-
"executable" : "<ExeName>/Contents/MacOS/<UnityProductName>",
3+
"executable" : "<ExeName>",
44
"productid" : "<ProductID>",
55
"sandboxid" : "<SandboxID>",
66
"deploymentid" : "<DeploymentID>",

Runtime/EOS_SDK/Core/Config.cs

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
// Copyright Epic Games, Inc. All Rights Reserved.
2+
3+
#if DEBUG
4+
#define EOS_DEBUG
5+
#endif
6+
7+
#if UNITY_EDITOR
8+
#define EOS_EDITOR
9+
#endif
10+
11+
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_PS5 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID || UNITY_WSA
12+
#define EOS_UNITY
13+
#endif
14+
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
21+
22+
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
23+
#define EOS_PLATFORM_OSX
24+
25+
#elif UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
26+
#define EOS_PLATFORM_LINUX
27+
28+
#elif UNITY_PS4
29+
#define EOS_PLATFORM_PS4
30+
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
39+
#elif UNITY_XBOXONE
40+
#define EOS_PLATFORM_XBOXONE
41+
42+
#elif UNITY_SWITCH
43+
#define EOS_PLATFORM_SWITCH
44+
45+
#elif UNITY_IOS || __IOS__
46+
#define EOS_PLATFORM_IOS
47+
48+
#elif UNITY_ANDROID || __ANDROID__
49+
#define EOS_PLATFORM_ANDROID
50+
51+
#endif
52+
53+
using System.Runtime.InteropServices;
54+
55+
namespace Epic.OnlineServices
56+
{
57+
58+
public static partial class Config
59+
{
60+
61+
#if EOS_PLATFORM_WINDOWS_32 || EOS_PLATFORM_WINDOWS_64 || EOS_PLATFORM_OSX || EOS_PLATFORM_LINUX || EOS_PLATFORM_IOS || EOS_PLATFORM_ANDROID
62+
public const string LibraryName =
63+
#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
64+
"EOSSDK-Win32-Shipping"
65+
#elif EOS_PLATFORM_WINDOWS_32
66+
"EOSSDK-Win32-Shipping.dll"
67+
68+
#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
69+
"EOSSDK-Win64-Shipping"
70+
#elif EOS_PLATFORM_WINDOWS_64
71+
"EOSSDK-Win64-Shipping.dll"
72+
73+
#elif EOS_PLATFORM_OSX && EOS_UNITY
74+
"libEOSSDK-Mac-Shipping"
75+
#elif EOS_PLATFORM_OSX
76+
"libEOSSDK-Mac-Shipping.dylib"
77+
78+
#elif EOS_PLATFORM_LINUX && EOS_UNITY
79+
"libEOSSDK-Linux-Shipping"
80+
#elif EOS_PLATFORM_LINUX
81+
"libEOSSDK-Linux-Shipping.so"
82+
83+
#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
84+
"EOSSDK"
85+
#elif EOS_PLATFORM_IOS
86+
"EOSSDK.framework/EOSSDK"
87+
88+
#elif EOS_PLATFORM_ANDROID
89+
"EOSSDK"
90+
91+
#elif EOS_PLATFORM_PS4
92+
#if EOS_PLATFORM_PS4_CROSSGEN
93+
"EOSSDKCrossgen-PS4-Shipping.prx"
94+
#else
95+
"EOSSDK-PS4-Shipping.prx"
96+
#endif
97+
#elif EOS_PLATFORM_PS5
98+
"EOSSDK-PS5-Shipping.prx"
99+
100+
#elif EOS_PLATFORM_SWITCH
101+
"EOSSDK-Switch-Shipping"
102+
103+
#elif EOS_PLATFORM_XBOXONE_GDK
104+
"EOSSDK-XboxOneGDK-Shipping"
105+
106+
#elif EOS_PLATFORM_XSX
107+
"EOSSDK-XSX-Shipping"
108+
109+
#elif EOS_DISABLE
110+
#warning Disabling EOS
111+
112+
#else
113+
#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.
114+
"EOSSDK-UnknownPlatform-Shipping"
115+
116+
#endif
117+
;
118+
#endif
119+
// PEW: End modify
120+
public const CallingConvention LibraryCallingConvention =
121+
#if EOS_PLATFORM_WINDOWS_32
122+
CallingConvention.StdCall
123+
#else
124+
CallingConvention.Cdecl
125+
#endif
126+
;
127+
}
128+
}

Runtime/EOS_SDK/Core/Config.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)