feat: add compilation flags around all uwb files

immutable · Nov 28, 2024 · e98f7e7 · e98f7e7
1 parent c37d7da
commit e98f7e7
Show file tree

Hide file tree

Showing 71 changed files with 460 additions and 97 deletions.
diff --git a/src/Packages/Passport/Runtime/Resources/index.html b/src/Packages/Passport/Runtime/Resources/index.html
diff --git a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs
@@ -191,7 +191,6 @@ private async UniTask Initialise(
                     this.webBrowserClient = new UwbWebView();
                     await ((UwbWebView)this.webBrowserClient).Init(engineStartupTimeoutMs);
                     readySignalReceived = true;
-
 #endif
                 }
 #elif (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX || UNITY_WEBGL

diff --git a/...yWebBrowser/[email protected]/Runtime/NativeArrayExtensions.cs b/...yWebBrowser/[email protected]/Runtime/NativeArrayExtensions.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 using System;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
@@ -51,4 +53,6 @@ public static unsafe void CopyTo<T>(this NativeArray<T> array, Span<T> dst)
             }
         }
     }
-}
+}
+
+#endif
diff --git a/...yWebBrowser/[email protected]/Runtime/NativeSliceExtensions.cs b/...yWebBrowser/[email protected]/Runtime/NativeSliceExtensions.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 using System;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
@@ -51,4 +53,6 @@ public static unsafe void CopyTo<T>(this NativeSlice<T> array, Span<T> dst)
             }
         }
     }
-}
+}
+
+#endif
diff --git a/...ty/UnityWebBrowser/[email protected]/Runtime/SpanExtensions.cs b/...ty/UnityWebBrowser/[email protected]/Runtime/SpanExtensions.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 using System;
 using Unity.Collections;
 
@@ -61,3 +63,6 @@ public static NativeArray<T> ToNativeArray<T>(this ReadOnlySpan<T> source, Alloc
         }
     }
 }
+
+
+#endif
diff --git a/.../ThirdParty/UnityWebBrowser/[email protected]/Runtime/Utils.cs b/.../ThirdParty/UnityWebBrowser/[email protected]/Runtime/Utils.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 using System;
 using System.Diagnostics;
 using Unity.Collections.LowLevel.Unsafe;
@@ -23,4 +25,6 @@ internal static void CheckCopyLengths(int srcLength, int dstLength)
                 throw new ArgumentException("source and destination length must be the same");
         }
     }
-}
+}
+
+#endif
diff --git a/[email protected]/Runtime/VoltstroStudios.NativeArraySpanExtensions.asmdef b/[email protected]/Runtime/VoltstroStudios.NativeArraySpanExtensions.asmdef
@@ -1,14 +1,17 @@
 {
-  "name": "VoltstroStudios.NativeArraySpanExtensions",
-  "rootNamespace": "VoltstroStudios.NativeArraySpanExtensions",
-  "references": [],
-  "includePlatforms": [],
-  "excludePlatforms": [],
-  "allowUnsafeCode": true,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
+    "name": "VoltstroStudios.NativeArraySpanExtensions",
+    "rootNamespace": "VoltstroStudios.NativeArraySpanExtensions",
+    "references": [],
+    "includePlatforms": [
+        "Editor",
+        "WindowsStandalone64"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
diff --git a/[email protected]/Plugins/VoltstroStudios.UnityWebBrowser.Shared.dll.meta b/[email protected]/Plugins/VoltstroStudios.UnityWebBrowser.Shared.dll.meta
diff --git a/...ime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/AssemblyInfo.cs b/...ime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/AssemblyInfo.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 //
@@ -40,3 +42,6 @@
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Tests")]
+
+
+#endif
diff --git a/...WebBrowser/[email protected]/Runtime/Communication/CommunicationLayer.cs b/...WebBrowser/[email protected]/Runtime/Communication/CommunicationLayer.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -60,4 +62,6 @@ public abstract class CommunicationLayer : ScriptableObject
         public abstract void GetIpcSettings(out object outLocation, out object inLocation,
             [CanBeNull] out string layerName);
     }
-}
+}
+
+#endif
diff --git a/...Browser/[email protected]/Runtime/Communication/TCPCommunicationLayer.cs b/...Browser/[email protected]/Runtime/Communication/TCPCommunicationLayer.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -47,4 +49,6 @@ public override void GetIpcSettings(out object outLocation, out object inLocatio
             layerName = "TCP";
         }
     }
-}
+}
+
+#endif
diff --git a/...y/UnityWebBrowser/[email protected]/Runtime/Core/BaseUwbClientManager.cs b/...y/UnityWebBrowser/[email protected]/Runtime/Core/BaseUwbClientManager.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -145,4 +147,6 @@ public void ExecuteJs(string js)
 
         #endregion
     }
-}
+}
+
+#endif
diff --git a/...rdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/Engine.cs b/...rdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/Engine.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -81,4 +83,6 @@ public struct EnginePlatformFiles
         [Obsolete]
         public abstract string EngineFilesNotFoundError { get; }
     }
-}
+}
+
+#endif
diff --git a/...WebBrowser/[email protected]/Runtime/Core/Engines/EngineConfiguration.cs b/...WebBrowser/[email protected]/Runtime/Core/Engines/EngineConfiguration.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -46,4 +48,6 @@ public override string GetEngineExecutableName()
 
         public override IEnumerable<EnginePlatformFiles> EngineFiles => engineFiles;
     }
-}
+}
+
+#endif
diff --git a/.../UnityWebBrowser/[email protected]/Runtime/Core/Engines/EngineProcess.cs b/.../UnityWebBrowser/[email protected]/Runtime/Core/Engines/EngineProcess.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -82,4 +84,6 @@ public void Dispose()
             processHandle.Dispose();
         }
     }
-}
+}
+
+#endif
diff --git a/...ityWebBrowser/[email protected]/Runtime/Core/Engines/Process/IProcess.cs b/...ityWebBrowser/[email protected]/Runtime/Core/Engines/Process/IProcess.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -18,4 +20,6 @@ internal interface IProcess : IDisposable
 
         public int ExitCode { get; }
     }
-}
+}
+
+#endif
diff --git a/...ebBrowser/[email protected]/Runtime/Core/Engines/Process/LinuxProcess.cs b/...ebBrowser/[email protected]/Runtime/Core/Engines/Process/LinuxProcess.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -118,4 +120,6 @@ private static int RunProcessAndWaitForExit(string fileName, string arguments, T
     }
 }
 
+#endif
+
 #endif
diff --git a/...ebBrowser/[email protected]/Runtime/Core/Engines/Process/MacOsProcess.cs b/...ebBrowser/[email protected]/Runtime/Core/Engines/Process/MacOsProcess.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -55,3 +57,6 @@ public void Dispose()
 }
 
 #endif
+
+
+#endif
diff --git a/...bBrowser/[email protected]/Runtime/Core/Engines/Process/WindowProcess.cs b/...bBrowser/[email protected]/Runtime/Core/Engines/Process/WindowProcess.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -166,4 +168,6 @@ public struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
     }
 }
 
+#endif
+
 #endif
diff --git a/...arty/UnityWebBrowser/[email protected]/Runtime/Core/FullscreenHandler.cs b/...arty/UnityWebBrowser/[email protected]/Runtime/Core/FullscreenHandler.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2022 Voltstro-Studios
 // 
@@ -60,4 +62,6 @@ public void OnEngineFullscreen(bool fullscreen)
             }
         }
     }
-}
+}
+
+#endif
diff --git a/...ebBrowser/[email protected]/Runtime/Core/Js/InvalidArgumentsException.cs b/...ebBrowser/[email protected]/Runtime/Core/Js/InvalidArgumentsException.cs
@@ -1,3 +1,5 @@
+#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
+
 // UnityWebBrowser (UWB)
 // Copyright (c) 2021-2024 Voltstro-Studios
 // 
@@ -16,4 +18,6 @@ internal InvalidArgumentsException(string message) : base(message)
         {
         }
     }
-}
+}
+
+#endif