Use architecture-agnostic RID for ANGLE OSX builds (#2293)

* Use architecture-agnostic RID for ANGLE OSX builds * New binaries for ANGLE on Darwin 22.6.0 Darwin Kernel Version 22.6.0: Wed Jul 31 21:41:04 PDT 2024; root:xnu-8796.141.3.707.4~1/RELEASE_ARM64_VMAPPLE (#2294) Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com> * Remove references to now redundant RID dirs * New binaries for ANGLE on Darwin 22.6.0 Darwin Kernel Version 22.6.0: Wed Jul 31 21:41:04 PDT 2024; root:xnu-8796.141.3.707.4~1/RELEASE_ARM64_VMAPPLE (#2295) Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com> --------- Co-authored-by: silkdotnet <85832961+silkdotnet@users.noreply.github.com> Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
dotnet · Oct 5, 2024 · a9c75a6 · a9c75a6
1 parent 1c08ac5
commit a9c75a6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/build/nuke/Native/Angle.cs b/build/nuke/Native/Angle.cs
@@ -99,27 +99,19 @@ partial class Build {
                         }
                         
                         // create universal mac binaries
-                        var arm64NativeRuntimes = runtimes / "osx-arm64" / "native";
-                        var x64NativeRuntimes = runtimes / "osx-x64" / "native";
-                        EnsureCleanDirectory(arm64NativeRuntimes);
-                        EnsureCleanDirectory(x64NativeRuntimes);
+                        var universalNativeRuntimes = runtimes / "osx" / "native";
+                        EnsureCleanDirectory(universalNativeRuntimes);
                         foreach (var lib in new[] { "libGLESv2.dylib", "libEGL.dylib" })
                         {
                             var x64Lib = angleSourceDir / "out" / "Release_x64" / lib;
                             var arm64Lib = angleSourceDir / "out" / "Release_arm64" / lib;
                             InheritedShell
                                 (
-                                    $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{arm64NativeRuntimes / lib}\"",
+                                    $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{universalNativeRuntimes / lib}\"",
                                     angleSourceDir
                                 )
                                 .AssertZeroExitCode();
                         }
-                        
-                        CopyAll
-                        (
-                            arm64NativeRuntimes.GlobFiles("libGLESv2.dll", "libEGL.dll", "libANGLE.dll"),
-                            x64NativeRuntimes
-                        );
                     }
                     // else
                     //     if (OperatingSystem.IsLinux())

diff --git a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libEGL.dylib b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libEGL.dylib
diff --git a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libEGL.dylib b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libEGL.dylib
diff --git a/...e/runtimes/osx-x64/native/libGLESv2.dylib → ...ative/runtimes/osx/native/libGLESv2.dylib b/...e/runtimes/osx-x64/native/libGLESv2.dylib → ...ative/runtimes/osx/native/libGLESv2.dylib