diff --git a/build/nuke/Native/Angle.cs b/build/nuke/Native/Angle.cs index 172e169eb0..0598d90e92 100644 --- 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 deleted file mode 100755 index 8be02559df..0000000000 Binary files a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libEGL.dylib and /dev/null differ 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 new file mode 100755 index 0000000000..90e2d198d0 Binary files /dev/null and b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libEGL.dylib differ diff --git a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libGLESv2.dylib b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libGLESv2.dylib similarity index 59% rename from src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libGLESv2.dylib rename to src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libGLESv2.dylib index 4c0510c2a3..f2d6c589b8 100755 Binary files a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libGLESv2.dylib and b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libGLESv2.dylib differ