Fix MoltenVK build

dotnet · Mar 24, 2024 · 7c6d2eb · 7c6d2eb
1 parent 3af99fc
commit 7c6d2eb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/moltenvk.yml b/.github/workflows/moltenvk.yml
@@ -16,7 +16,7 @@ jobs:
             fail-fast: false
             matrix:
                 env:
-                    - os: macos-latest
+                    - os: macos-13-xlarge
                       name: Darwin
                       nuke_invoke: ./build.sh
                       extras: ""

diff --git a/build/nuke/Native/MoltenVK.cs b/build/nuke/Native/MoltenVK.cs
@@ -22,14 +22,16 @@ partial class Build {
                     {
                         var runtimes = RootDirectory / "src" / "Native" / "Silk.NET.MoltenVK.Native" / "runtimes";
 
-                        InheritedShell($"./fetchDependencies --ios --iossim --maccat", MoltenVKPath).AssertZeroExitCode();
-                        InheritedShell($"make ios iossim maccat", MoltenVKPath).AssertZeroExitCode();
+                        InheritedShell($"./fetchDependencies --ios --iossim --maccat --macos", MoltenVKPath).AssertZeroExitCode();
+                        InheritedShell($"make ios iossim maccat macos", MoltenVKPath).AssertZeroExitCode();
 
-                        var xcFrameworkDir = MoltenVKPath / "Package" / "Release" / "MoltenVK" / "MoltenVK.xcframework";
+                        var xcFrameworkDir = MoltenVKPath / "Package" / "Release" / "MoltenVK" / "static" / "MoltenVK.xcframework";
 
                         CopyFile(xcFrameworkDir / "ios-arm64" / "libMoltenVK.a", runtimes / "ios" / "native" / "libMoltenVK.a", FileExistsPolicy.Overwrite);
                         CopyFile(xcFrameworkDir / "ios-arm64_x86_64-simulator" / "libMoltenVK.a", runtimes / "iossimulator" / "native"  / "libMoltenVK.a", FileExistsPolicy.Overwrite);
                         CopyFile(xcFrameworkDir / "ios-arm64_x86_64-maccatalyst" / "libMoltenVK.a", runtimes / "maccatalyst" / "native" / "libMoltenVK.a", FileExistsPolicy.Overwrite);
+                        CopyFile(MoltenVKPath / "Package" / "Release" / "MoltenVK" / "dynamic" / "dylib" / "macOS" / "libMoltenVK.dylib", runtimes / "osx" / "native" / "libMoltenVK.dylib");
+                        CopyFile(MoltenVKPath / "Package" / "Release" / "MoltenVK" / "dynamic" / "dylib" / "macOS" / "MoltenVK_icd.json", runtimes / "osx" / "native" / "MoltenVK_icd.json");
                     }
 
                     PrUpdatedNativeBinary("MoltenVK");

diff --git a/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj b/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj
@@ -16,6 +16,8 @@
         <Content Include="runtimes\iossimulator\native\libMoltenVK.a" PackagePath="runtimes\iossimulator\native\libMoltenVK.a" />
         <Content Include="runtimes\maccatalyst\native\libMoltenVK.a" PackagePath="runtimes\maccatalyst\native\libMoltenVK.a" />
         <Content Include="runtimes\ios\native\libMoltenVK.a" PackagePath="runtimes\ios\native\libMoltenVK.a" />
+        <Content Include="runtimes\osx\native\libMoltenVK.dylib" PackagePath="runtimes\osx\native\libMoltenVK.dylib" />
+        <Content Include="runtimes\osx\native\MoltenVK_icd.json" PackagePath="runtimes\osx\native\MoltenVK_icd.json" />
         <Content Include="build\netstandard2.0\Silk.NET.MoltenVK.Native.targets" PackagePath="build\netstandard2.0\Silk.NET.MoltenVK.Native.targets" />
     </ItemGroup>
 

diff --git a/src/Native/Silk.NET.MoltenVK.Native/runtimes/ios/native/libMoltenVK.a b/src/Native/Silk.NET.MoltenVK.Native/runtimes/ios/native/libMoltenVK.a
diff --git a/src/Native/Silk.NET.MoltenVK.Native/runtimes/iossimulator/native/libMoltenVK.a b/src/Native/Silk.NET.MoltenVK.Native/runtimes/iossimulator/native/libMoltenVK.a
diff --git a/src/Native/Silk.NET.MoltenVK.Native/runtimes/maccatalyst/native/libMoltenVK.a b/src/Native/Silk.NET.MoltenVK.Native/runtimes/maccatalyst/native/libMoltenVK.a
diff --git a/src/Native/Silk.NET.MoltenVK.Native/runtimes/osx/native/MoltenVK_icd.json b/src/Native/Silk.NET.MoltenVK.Native/runtimes/osx/native/MoltenVK_icd.json
@@ -0,0 +1,8 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD": {
+        "library_path": "./libMoltenVK.dylib",
+        "api_version" : "1.2.0",
+        "is_portability_driver" : true
+    }
+}
diff --git a/src/Native/Silk.NET.MoltenVK.Native/runtimes/osx/native/libMoltenVK.dylib b/src/Native/Silk.NET.MoltenVK.Native/runtimes/osx/native/libMoltenVK.dylib