Skip to content

Commit a9c75a6

Browse files
Perkseysilkdotnetdotnet-bot
authored
Use architecture-agnostic RID for ANGLE OSX builds (dotnet#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 (dotnet#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 (dotnet#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>
1 parent 1c08ac5 commit a9c75a6

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

build/nuke/Native/Angle.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,19 @@ partial class Build {
9999
}
100100

101101
// create universal mac binaries
102-
var arm64NativeRuntimes = runtimes / "osx-arm64" / "native";
103-
var x64NativeRuntimes = runtimes / "osx-x64" / "native";
104-
EnsureCleanDirectory(arm64NativeRuntimes);
105-
EnsureCleanDirectory(x64NativeRuntimes);
102+
var universalNativeRuntimes = runtimes / "osx" / "native";
103+
EnsureCleanDirectory(universalNativeRuntimes);
106104
foreach (var lib in new[] { "libGLESv2.dylib", "libEGL.dylib" })
107105
{
108106
var x64Lib = angleSourceDir / "out" / "Release_x64" / lib;
109107
var arm64Lib = angleSourceDir / "out" / "Release_arm64" / lib;
110108
InheritedShell
111109
(
112-
$"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{arm64NativeRuntimes / lib}\"",
110+
$"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{universalNativeRuntimes / lib}\"",
113111
angleSourceDir
114112
)
115113
.AssertZeroExitCode();
116114
}
117-
118-
CopyAll
119-
(
120-
arm64NativeRuntimes.GlobFiles("libGLESv2.dll", "libEGL.dll", "libANGLE.dll"),
121-
x64NativeRuntimes
122-
);
123115
}
124116
// else
125117
// if (OperatingSystem.IsLinux())
Binary file not shown.
Binary file not shown.

src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx-x64/native/libGLESv2.dylib renamed to src/Native/Silk.NET.OpenGLES.ANGLE.Native/runtimes/osx/native/libGLESv2.dylib

14.8 MB
Binary file not shown.

0 commit comments

Comments
 (0)