More improvements to native library builds

.github/workflows/assimp.yml

@@ -7,6 +7,7 @@ on:
       - "main"
     paths:
       - build/submodules/Assimp
+      - "build/cmake/*"
       - build/nuke/Native/Core.cs
       - build/nuke/Native/Assimp.cs
       - .github/workflows/assimp.yml

.github/workflows/glfw.yml

@@ -7,6 +7,7 @@ on:
       - "main"
     paths:
       - "build/submodules/GLFW"
+      - "build/cmake/*"
       - "build/nuke/Native/Core.cs"
       - "build/nuke/Native/GLFW.cs"
       - .github/workflows/glfw.yml

.github/workflows/openal-soft.yml

@@ -7,6 +7,7 @@ on:
       - "main"
     paths:
       - build/submodules/openal-soft
+      - "build/cmake/*"
       - build/nuke/Native/Core.cs
       - build/nuke/Native/OpenALSoft.cs
       - .github/workflows/openal-soft.yml

.github/workflows/sdl2.yml

@@ -7,6 +7,7 @@ on:
       - "main"
     paths:
       - build/submodules/SDL
+      - "build/cmake/*"
       - build/nuke/Native/Core.cs
       - build/nuke/Native/SDL2.cs
       - .github/workflows/sdl2.yml

.github/workflows/swiftshader.yml

@@ -3,6 +3,7 @@ on:
   push:
     paths:
       - build/submodules/SwiftShader
+      - "build/cmake/*"
       - build/nuke/Native/Core.cs
       - build/nuke/Native/SwiftShader.cs
       - .github/workflows/swiftshader.yml

.github/workflows/vulkan-loader.yml

@@ -7,6 +7,7 @@ on:
       - "main"
     paths:
       - build/submodules/Vulkan-Loader
+      - "build/cmake/*"
       - build/nuke/Native/Core.cs
       - build/nuke/Native/VulkanLoader.cs
       - .github/workflows/vulkan-loader.yml
@@ -46,6 +47,10 @@ jobs:
               for arch in amd64 arm64 armhf; do
                 sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch
               done
+              wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240417/llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
+              sudo mkdir /opt/llvm-mingw-msvcrt
+              sudo tar xf llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
+              rm llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
           - os: windows-2022
             name: Windows
             nuke_invoke: ./build.cmd

build/cmake/aarch64-linux-gnu.cmake

@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as")
 set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
 set(CMAKE_LINKER "/usr/bin/aarch64-linux-gnu-ld")

build/cmake/aarch64-w64-mingw32.cmake

@@ -0,0 +1,12 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as")
+set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
+set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++")
+set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres")
+set(CMAKE_LINKER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ld")
+set(CMAKE_FIND_ROOT_PATH "/opt/llvm-mingw-msvcrt/aarch64-w64-mingw32")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

build/cmake/arm-linux-gnueabihf.cmake

@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
+set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as")
 set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
 set(CMAKE_LINKER "/usr/bin/arm-linux-gnueabihf-ld")

build/cmake/x86_64-linux-gnu.cmake

@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
+set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as")
 set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
 set(CMAKE_LINKER "/usr/bin/x86_64-linux-gnu-ld")

build/nuke/Native/Core.cs

@@ -50,7 +50,7 @@ public void CopyAs(AbsolutePath @out, string from, string to)
         CopyFile(file, to, FileExistsPolicy.Overwrite);
     }
 
-    public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
+    public void PrUpdatedNativeBinary(string name)
     {
         var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
         var curBranch = GitCurrentBranch(RootDirectory);
@@ -63,22 +63,10 @@ public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
             !curBranch.StartsWith("develop/", StringComparison.OrdinalIgnoreCase))
         {
             // it's assumed that the pushable token was used to checkout the repo
-            if (OperatingSystem.IsWindows())
-            {
-                glob ??= "src/Native/**/*.dll";
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                glob ??= "src/Native/**/*.a src/Native/**/*.dylib";
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                glob ??= "src/Native/**/*.so*";
-            }
 
             Git("fetch --all", RootDirectory);
             Git("pull");
-            Git($"add -f {glob}", RootDirectory);
+            Git($"add -f src/Native/*/runtimes/*/native/*", RootDirectory);
             var newBranch = $"ci/{curBranch}/{name.ToLower().Replace(' ', '_')}_bins";
             var curCommit = GitCurrentCommit(RootDirectory);
             var commitCmd = InheritedShell

build/nuke/Native/Dxvk.cs

@@ -133,25 +133,8 @@ partial class Build {
                        CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib/*"), runtimes   / "linux-x64" / "native");
                        CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib32/*"), runtimes / "linux-x86" / "native");
 
-                       var winx64 = runtimes / "win-x64" / "native";
-                       var winx86 = runtimes / "win-x86" / "native";
-                       
-                       var linuxx64 = runtimes / "linux-x64" / "native";
-                       var linuxx86 = runtimes / "linux-x86" / "native";
-
-                       var glob = string.Empty;
-                       var files = winx64.GlobFiles("*.dll")
-                                         .Concat(winx86.GlobFiles("*.dll"))
-                                         .Concat(linuxx64.GlobFiles("*.so"))
-                                         .Concat(linuxx86.GlobFiles("*.so"));
-
-                       glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
-
-                       PrUpdatedNativeBinary
-                       (
-                           "DXVK", glob
-                       );
+                       PrUpdatedNativeBinary("DXVK");
                    }
                )
     );
-}
+}

build/nuke/Native/SPIRVCross.cs

@@ -144,19 +144,7 @@ pub fn build(b: *std.Build) void {
                         CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "libspirv-cross.dylib", runtimes / "osx-arm64" / "native" / "libspirv-cross.dylib", FileExistsPolicy.Overwrite);
                     }
 
-                    var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
-                        .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
-                        .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
-                        .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
-                        .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
-                        .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
-                        .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
-                        .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
-
-                    var glob = string.Empty;
-                    glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
-
-                    PrUpdatedNativeBinary("SPIRV-Cross", glob);
+                    PrUpdatedNativeBinary("SPIRV-Cross");
                 }
             )
         );

build/nuke/Native/SPIRVReflect.cs

@@ -105,19 +105,7 @@ pub fn build(b: *std.Build) void {
                         CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "libspirv-reflect.dylib", runtimes / "osx-arm64" / "native" / "libspirv-reflect.dylib", FileExistsPolicy.Overwrite);
                     }
 
-                    var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
-                        .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
-                        .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
-                        .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
-                        .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
-                        .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
-                        .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
-                        .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
-
-                    var glob = string.Empty;
-                    glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
-
-                    PrUpdatedNativeBinary("SPIRV-Reflect", glob);
+                    PrUpdatedNativeBinary("SPIRV-Reflect");
                 }
             )
         );

build/nuke/Native/Shaderc.cs

@@ -618,19 +618,7 @@ pub fn build(b: *std.Build) void {
             InheritedShell($"zig build -Dtarget=aarch64-macos {optimizeMode}", ShadercPath).AssertZeroExitCode();
             CopyFile(ShadercPath / "zig-out" / "lib" / $"lib{libname}.dylib", runtimes / "osx-arm64" / "native" / $"lib{libname}.dylib", FileExistsPolicy.Overwrite);
 
-            var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
-                .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
-                .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
-                .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
-                .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
-                .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
-                .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
-                .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
-
-            var glob = string.Empty;
-            glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
-
-            PrUpdatedNativeBinary("Shaderc", glob);
+            PrUpdatedNativeBinary("Shaderc");
         }
         )
     );

build/nuke/Native/SwiftShader.cs

@@ -42,7 +42,8 @@ partial class Build {
                     var prepare = "cmake .. -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE";
                     var build = $"cmake --build . --config Release{JobsArg}";
 
-                    // Work around SwiftShader's silly Git hook installation logic that fails as a submodule.
+                    // Work around SwiftShader's silly Git hook installation logic that fails as a submodule
+                    // since `.git` is just a file containing a `gitdir` directive.
                     File.WriteAllText(
                         SwiftShaderPath / "CMakeLists.txt",
                         File.ReadAllText(SwiftShaderPath / "CMakeLists.txt")
@@ -54,6 +55,7 @@ partial class Build {
                         {
                             ("Win32", "win-x86"),
                             ("x64", "win-x64"),
+                            ("ARM64", "win-arm64"),
                         })
                         {
                             EnsureCleanDirectory(buildDir);

build/nuke/Native/VulkanLoader.cs

@@ -60,7 +60,6 @@ partial class Build {
                     }
                     else if (OperatingSystem.IsLinux())
                     {
-
                         foreach (var (triple, rid) in new[]
                         {
                             ("x86_64-linux-gnu", "linux-x64"),
@@ -76,6 +75,16 @@ partial class Build {
 
                             CopyAll((buildDir / "loader").GlobFiles("libvulkan.so"), runtimes / rid / "native");
                         }
+
+                        // Build for win-arm64 with llvm-mingw.
+                        {
+                            EnsureCleanDirectory(buildDir);
+
+                            InheritedShell($"{prepare} -DUSE_GAS=ON {GetCMakeToolchainFlag("aarch64-w64-mingw32")}", buildDir).AssertZeroExitCode();
+                            InheritedShell(build, buildDir).AssertZeroExitCode();
+
+                            CopyAll((buildDir / "loader").GlobFiles("vulkan-1.dll"), runtimes / "win-arm64" / "native");
+                        }
                     }
                     else if (OperatingSystem.IsMacOS())
                     {

src/Native/Directory.Build.targets

@@ -1,5 +1,7 @@
 <Project>
   <ItemGroup>
+    <Content Include="build/**" PackagePath="build/%(RecursiveDir)%(Filename)%(Extension)" />
+    <Content Include="runtimes/**" PackagePath="runtimes/%(RecursiveDir)%(Filename)%(Extension)" />
     <Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/net461" />
     <Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/netstandard2.0" />
   </ItemGroup>

src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -17,20 +13,6 @@
     <Description>Multi-platform native library for Assimp.</Description>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/assimp/assimp</RepositoryUrl>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeContentInPack>true</IncludeContentInPack>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
-    <Content Include="runtimes\linux-arm\native\libassimp.so.5" PackagePath="runtimes\linux-arm\native\libassimp.so.5" />
-    <Content Include="runtimes\linux-arm64\native\libassimp.so.5" PackagePath="runtimes\linux-arm64\native\libassimp.so.5" />
-    <Content Include="runtimes\linux-x64\native\libassimp.so.5" PackagePath="runtimes\linux-x64\native\libassimp.so.5" />
-    <Content Include="runtimes\osx-arm64\native\libassimp.5.dylib" PackagePath="runtimes\osx-arm64\native\libassimp.5.dylib" />
-    <Content Include="runtimes\osx-x64\native\libassimp.5.dylib" PackagePath="runtimes\osx-x64\native\libassimp.5.dylib" />
-    <Content Include="runtimes\win-arm64\native\Assimp64.dll" PackagePath="runtimes\win-arm64\native\Assimp32.dll" />
-    <Content Include="runtimes\win-x64\native\Assimp64.dll" PackagePath="runtimes\win-x64\native\Assimp64.dll" />
-    <Content Include="runtimes\win-x86\native\Assimp32.dll" PackagePath="runtimes\win-x86\native\Assimp32.dll" />
-  </ItemGroup>
-
 </Project>

src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -16,58 +12,6 @@
         <Description>Multi-platform native library for DXVK.</Description>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/doitsujin/dxvk</RepositoryUrl>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IncludeContentInPack>true</IncludeContentInPack>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
-
-        <Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so"
-                 PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so" />
-        <Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so"
-                 PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so" />
-        <Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so"
-                 PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so" />
-        <Content Include="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so"
-                 PackagePath="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so" />
-
-        <Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so"
-                 PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so" />
-        <Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so"
-                 PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so" />
-        <Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so"
-                 PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so" />
-        <Content Include="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so"
-                 PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so" />
-
-        <Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so" 
-                 PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so" />
-        <Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so" 
-                 PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so" />
-        <Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so" 
-                 PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so" />
-        <Content Include="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so" 
-                 PackagePath="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so" />
-
-        <Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so"
-                 PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so" />
-        <Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so"
-                 PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so" />
-        <Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so"
-                 PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so" />
-        <Content Include="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so"
-                 PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so" />
-
-        <Content Include="runtimes\win-x64\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d11.dll" />
-        <Content Include="runtimes\win-x64\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x64\native\dxvk-dxgi.dll" />
-        <Content Include="runtimes\win-x64\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d9.dll" />
-        <Content Include="runtimes\win-x64\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d10core.dll" />
-
-        <Content Include="runtimes\win-x86\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d11.dll" />
-        <Content Include="runtimes\win-x86\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x86\native\dxvk-dxgi.dll" />
-        <Content Include="runtimes\win-x86\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d9.dll" />
-        <Content Include="runtimes\win-x86\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d10core.dll" />
-    </ItemGroup>
-
 </Project>