fix: Correct conditions where the scripting define EOS_DISABLE is defined for the player.

Author: paulhazen

Assets/Plugins/Source/Editor/EditorWindows/EOSSettingsWindow.cs

@@ -24,7 +24,9 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Editor.Windows
 {
+#if !EOS_DISABLE
     using Epic.OnlineServices.UI;
+#endif
     using PlayEveryWare.EpicOnlineServices.Extensions;
     using PlayEveryWare.EpicOnlineServices.Utility;
     using System;
@@ -111,7 +113,7 @@ private string GenerateEOSGeneratedFile(EOSConfig aEOSConfig)
 #define PLATFORM_32BITS 1
 #endif
 
-        extern ""C"" __declspec(dllexport) char*  __stdcall GetConfigAsJSONString()
+    extern ""C"" __declspec(dllexport) char*  __stdcall GetConfigAsJSONString()
 {
             return ""{""
               ""productName:"" EOS_PRODUCT_NAME "",""
@@ -351,13 +353,15 @@ private void OnDefaultGUI()
                 ref mainEOSConfigFile.alwaysSendInputToOverlay, 190,
                 "If true, the plugin will always send input to the overlay from the C# side to native, and handle showing the overlay. This doesn't always mean input makes it to the EOS SDK.");
 
+#if !EOS_DISABLE
             InputStateButtonFlags toggleFriendsButtonCombinationEnum = mainEOSConfigFile.GetToggleFriendsButtonCombinationFlags();
             GUIEditorUtility.AssigningEnumField<InputStateButtonFlags>("Default Activate Overlay Button",
                 ref toggleFriendsButtonCombinationEnum, 190,
                 "Users can press the button(s) associated with this value to activate the Epic Social Overlay. Not all combinations are valid; the SDK will log an error at the start of runtime if an invalid combination is selected.");
             mainEOSConfigFile.toggleFriendsButtonCombination = EnumUtility<InputStateButtonFlags>.GetEnumerator(toggleFriendsButtonCombinationEnum)
                 .Select(enumValue => enumValue.ToString())
                 .ToList();
+#endif
         }
 
         protected override void RenderWindow()

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

@@ -29,13 +29,14 @@ namespace PlayEveryWare.EpicOnlineServices
     using Epic.OnlineServices.Auth;
     using Epic.OnlineServices.Platform;
     using Epic.OnlineServices.IntegratedPlatform;
+    using Epic.OnlineServices.UI;
 #endif
     using System;
     using System.Collections.Generic;
     using UnityEngine;
     using System.Text.RegularExpressions;
     using Extensions;
-    using Epic.OnlineServices.UI;
+    
     using PlayEveryWare.EpicOnlineServices.Utility;
 
     /// <summary>
@@ -344,9 +345,13 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
         /// use that value if this configuration field is null, empty, or contains
         /// only <see cref="InputStateButtonFlags.None"/>.
         /// </summary>
-        public List<string> toggleFriendsButtonCombination = new List<string>() { InputStateButtonFlags.SpecialLeft.ToString() };
+        public List<string> toggleFriendsButtonCombination = new List<string>() {
+#if !EOS_DISABLE
+            InputStateButtonFlags.SpecialLeft.ToString() 
+#endif
+        };
 
-        #endregion
+#endregion
 
         public static Regex InvalidEncryptionKeyRegex;
 

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/EventHandlers.cs

@@ -21,6 +21,8 @@
  *
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Events
 {
     using Epic.OnlineServices;
@@ -32,4 +34,6 @@ namespace PlayEveryWare.EpicOnlineServices.Events
     /// <param name="result">Result enum (defined within the EOS SDK).</param>
     // ReSharper disable once InconsistentNaming
     public delegate void EOSResultEventHandler(Result result);
-}
+}
+
+#endif

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/FileRequestTransferWrapper.cs

@@ -21,6 +21,8 @@
  *
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices
 {
     using Epic.OnlineServices;
@@ -157,4 +159,6 @@ protected void Dispose(bool disposing)
             _disposed = true;
         }
     }
-}
+}
+
+#endif

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/IFileTransferRequest.cs

@@ -21,6 +21,7 @@
  *
  */
 
+#if !EOS_DISABLE
 namespace PlayEveryWare.EpicOnlineServices
 {
     using Epic.OnlineServices;
@@ -31,4 +32,5 @@ public interface IFileTransferRequest : IDisposable
         public Result CancelRequest();
         public void Release();
     }
-}
+}
+#endif

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/PlayerDataStorageFileTransferRequestWrapper.cs

@@ -21,11 +21,12 @@
  *
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices
 {
     using Epic.OnlineServices;
     using Epic.OnlineServices.PlayerDataStorage;
-    using System;
 
     /// <summary>
     /// Used to wrap the PlayerDataStorageFileTransferRequest class provided by
@@ -57,4 +58,6 @@ public override void Release()
             _instance = null;
         }
     }
-}
+}
+
+#endif

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/TitleStorageFileTransferRequestWrapper.cs

@@ -21,6 +21,8 @@
  *
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices
 {
     using Epic.OnlineServices;
@@ -56,4 +58,6 @@ public override void Release()
             _instance = null;
         }
     }
-}
+}
+
+#endif