Updated to version 1.5.0

EOSSDK/Core/Config.cs

@@ -1,32 +1,96 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-//#define PLATFORM_32BITS
-//#define PLATFORM_64BITS
+#if DEBUG
+	#define EOS_DEBUG
+#endif
+
+#if UNITY_EDITOR
+	#define EOS_EDITOR
+#endif
 
-#if (UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN) && UNITY_64
-	#define PLATFORM_64BITS
-#elif (UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN)
-	#define PLATFORM_32BITS
+#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID
+	#define EOS_UNITY
 #endif
 
+#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS
+	#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
+		#define EOS_PLATFORM_WINDOWS_64
+	#else
+		#define EOS_PLATFORM_WINDOWS_32
+	#endif
+
+#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+	#define EOS_PLATFORM_OSX
+
+#elif UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
+	#define EOS_PLATFORM_LINUX
+
+#elif UNITY_PS4
+	#define EOS_PLATFORM_PS4
+
+#elif UNITY_XBOXONE
+	#define EOS_PLATFORM_XBOXONE
+
+#elif UNITY_SWITCH
+	#define EOS_PLATFORM_SWITCH
+
+#elif UNITY_IOS || __IOS__
+	#define EOS_PLATFORM_IOS
+
+#elif UNITY_ANDROID || __ANDROID__
+	#define EOS_PLATFORM_ANDROID
+
+#endif
+
+using System.Runtime.InteropServices;
+
 namespace Epic.OnlineServices
 {
-	internal static class Config
+	public static class Config
 	{
-		public const string BinaryName =
-		#if (UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX)
-			"libEOSSDK-Mac-Shipping"
-		#elif (UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN) && PLATFORM_64BITS
-			"EOSSDK-Win64-Shipping"
-		#elif (UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN) && PLATFORM_32BITS
+		public const string LibraryName =
+		#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
 			"EOSSDK-Win32-Shipping"
-		#elif PLATFORM_64BITS
-			"EOSSDK-Win64-Shipping.dll"
-		#elif PLATFORM_32BITS
+		#elif EOS_PLATFORM_WINDOWS_32
 			"EOSSDK-Win32-Shipping.dll"
+
+		#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
+			"EOSSDK-Win64-Shipping"
+		#elif EOS_PLATFORM_WINDOWS_64
+			"EOSSDK-Win64-Shipping.dll"
+
+		#elif EOS_PLATFORM_OSX && EOS_UNITY
+			"libEOSSDK-Mac-Shipping"
+		#elif EOS_PLATFORM_OSX
+			"libEOSSDK-Mac-Shipping.dylib"
+
+		#elif EOS_PLATFORM_LINUX && EOS_UNITY
+			"EOSSDK-Linux-Shipping"
+		#elif EOS_PLATFORM_LINUX
+			"EOSSDK-Linux-Shipping.so"
+
+		#elif EOS_PLATFORM_IOS && EOS_UNITY && !EOS_EDITOR
+			"__Internal"
+		#elif EOS_PLATFORM_IOS && EOS_UNITY
+			"EOSSDK"
+		#elif EOS_PLATFORM_IOS
+			"EOSSDK.framework/EOSSDK"
+
+		#elif EOS_PLATFORM_ANDROID
+			"EOSSDK"
+
 		#else
-			#error Unable to determine EOSSDK binary name. Ensure compilation symbols PLATFORM_32BITS and PLATFORM_64BITS have been set accordingly.
+			#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.
 			"EOSSDK-UnknownPlatform-Shipping"
+
+		#endif
+		;
+
+		public const CallingConvention LibraryCallingConvention =
+		#if EOS_PLATFORM_WINDOWS_32
+			CallingConvention.StdCall
+		#else
+			CallingConvention.Cdecl
 		#endif
 		;
 	}