Skip to content

Commit f3087ca

Browse files
alexrpdotnet-bot
andauthored
More improvements to native library builds (#2143)
* Native: Also include *.json files in PRs (e.g. vk_swiftshader_icd.json). * Native/SwiftShader: Update submodule to 764410d. * Native/SwiftShader: Build for win-arm64. * Native/SwiftShader: Update packaging paths in Silk.NET.Vulkan.SwiftShader.Native. This was missed in #2049. * Native/Vulkan Loader: Build for win-arm64. Vulkan Loader has GAS-style assembly that is essential to it functioning correctly, so to make things simple, we build on Linux using llvm-mingw. * Native/SwiftShader: Expand on a comment in the NUKE build script. * Native: Use absolute tool paths in aarch64-w64-mingw32.cmake. * Native: Re-run CMake-based workflows when build/cmake/* changes are pushed. * Native/Vulkan Loader: Remove llvm-mingw archive after extraction. * Native/Vulkan Loader: Pass extra glob path to the win-arm64 binary. This is needed since the default globs only include *.so on Linux. * New binaries for SwiftShader on Darwin 23.4.0 Darwin Kernel Version 23.4.0: Fri Mar 15 00:10:50 PDT 2024; root:xnu-10063.101.17~1/RELEASE_ARM64_VMAPPLE * Native/Vulkan Loader: Update submodule to v1.3.281. This brings it in line with our Vulkan-Headers submodule. * Native/Vulkan-Loader: Update submodule to 6d9e995. This brings in a number of build system fixes that we need for win-arm64. This commit is just prior to the update to Vulkan v1.3.282. * Native/Vulkan Loader: Fix path to vulkan-1.dll for win-arm64. * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * Native/Vulkan Loader: Fix path to vulkan-1.dll for win-arm64, take 2. * New binaries for Vulkan Loader on Darwin 23.4.0 Darwin Kernel Version 23.4.0: Fri Mar 15 00:10:50 PDT 2024; root:xnu-10063.101.17~1/RELEASE_ARM64_VMAPPLE * New binaries for Vulkan Loader on Linux 6.5.0-1018-azure #19~22.04.2-Ubuntu SMP Thu Mar 21 16:45:46 UTC 2024 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Linux 6.5.0-1018-azure #19~22.04.2-Ubuntu SMP Thu Mar 21 16:45:46 UTC 2024 * Native: Simplify `git add` glob for changed native binaries. * Native: Simplify NuGet packaging projects. * Native: Set CMAKE_ASM_COMPILER in all toolchain files. --------- Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
1 parent 0f4cce8 commit f3087ca

File tree

52 files changed

+101
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+101
-372
lines changed

.github/workflows/assimp.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "main"
88
paths:
99
- build/submodules/Assimp
10+
- "build/cmake/*"
1011
- build/nuke/Native/Core.cs
1112
- build/nuke/Native/Assimp.cs
1213
- .github/workflows/assimp.yml

.github/workflows/glfw.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "main"
88
paths:
99
- "build/submodules/GLFW"
10+
- "build/cmake/*"
1011
- "build/nuke/Native/Core.cs"
1112
- "build/nuke/Native/GLFW.cs"
1213
- .github/workflows/glfw.yml

.github/workflows/openal-soft.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "main"
88
paths:
99
- build/submodules/openal-soft
10+
- "build/cmake/*"
1011
- build/nuke/Native/Core.cs
1112
- build/nuke/Native/OpenALSoft.cs
1213
- .github/workflows/openal-soft.yml

.github/workflows/sdl2.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "main"
88
paths:
99
- build/submodules/SDL
10+
- "build/cmake/*"
1011
- build/nuke/Native/Core.cs
1112
- build/nuke/Native/SDL2.cs
1213
- .github/workflows/sdl2.yml

.github/workflows/swiftshader.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
paths:
55
- build/submodules/SwiftShader
6+
- "build/cmake/*"
67
- build/nuke/Native/Core.cs
78
- build/nuke/Native/SwiftShader.cs
89
- .github/workflows/swiftshader.yml

.github/workflows/vulkan-loader.yml

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "main"
88
paths:
99
- build/submodules/Vulkan-Loader
10+
- "build/cmake/*"
1011
- build/nuke/Native/Core.cs
1112
- build/nuke/Native/VulkanLoader.cs
1213
- .github/workflows/vulkan-loader.yml
@@ -46,6 +47,10 @@ jobs:
4647
for arch in amd64 arm64 armhf; do
4748
sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch
4849
done
50+
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240417/llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
51+
sudo mkdir /opt/llvm-mingw-msvcrt
52+
sudo tar xf llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
53+
rm llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
4954
- os: windows-2022
5055
name: Windows
5156
nuke_invoke: ./build.cmd

build/cmake/aarch64-linux-gnu.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(CMAKE_SYSTEM_PROCESSOR aarch64)
3+
set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as")
34
set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
45
set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
56
set(CMAKE_LINKER "/usr/bin/aarch64-linux-gnu-ld")

build/cmake/aarch64-w64-mingw32.cmake

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set(CMAKE_SYSTEM_NAME Windows)
2+
set(CMAKE_SYSTEM_PROCESSOR aarch64)
3+
set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as")
4+
set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
5+
set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++")
6+
set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres")
7+
set(CMAKE_LINKER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ld")
8+
set(CMAKE_FIND_ROOT_PATH "/opt/llvm-mingw-msvcrt/aarch64-w64-mingw32")
9+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
10+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
11+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
12+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

build/cmake/arm-linux-gnueabihf.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(CMAKE_SYSTEM_PROCESSOR armv7l)
3+
set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as")
34
set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
45
set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
56
set(CMAKE_LINKER "/usr/bin/arm-linux-gnueabihf-ld")

build/cmake/x86_64-linux-gnu.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(CMAKE_SYSTEM_PROCESSOR x86_64)
3+
set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as")
34
set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
45
set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
56
set(CMAKE_LINKER "/usr/bin/x86_64-linux-gnu-ld")

build/nuke/Native/Core.cs

+2-14
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void CopyAs(AbsolutePath @out, string from, string to)
5050
CopyFile(file, to, FileExistsPolicy.Overwrite);
5151
}
5252

53-
public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
53+
public void PrUpdatedNativeBinary(string name)
5454
{
5555
var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
5656
var curBranch = GitCurrentBranch(RootDirectory);
@@ -63,22 +63,10 @@ public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
6363
!curBranch.StartsWith("develop/", StringComparison.OrdinalIgnoreCase))
6464
{
6565
// it's assumed that the pushable token was used to checkout the repo
66-
if (OperatingSystem.IsWindows())
67-
{
68-
glob ??= "src/Native/**/*.dll";
69-
}
70-
else if (OperatingSystem.IsMacOS())
71-
{
72-
glob ??= "src/Native/**/*.a src/Native/**/*.dylib";
73-
}
74-
else if (OperatingSystem.IsLinux())
75-
{
76-
glob ??= "src/Native/**/*.so*";
77-
}
7866

7967
Git("fetch --all", RootDirectory);
8068
Git("pull");
81-
Git($"add -f {glob}", RootDirectory);
69+
Git($"add -f src/Native/*/runtimes/*/native/*", RootDirectory);
8270
var newBranch = $"ci/{curBranch}/{name.ToLower().Replace(' ', '_')}_bins";
8371
var curCommit = GitCurrentCommit(RootDirectory);
8472
var commitCmd = InheritedShell

build/nuke/Native/Dxvk.cs

+2-19
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,8 @@ partial class Build {
133133
CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib/*"), runtimes / "linux-x64" / "native");
134134
CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib32/*"), runtimes / "linux-x86" / "native");
135135

136-
var winx64 = runtimes / "win-x64" / "native";
137-
var winx86 = runtimes / "win-x86" / "native";
138-
139-
var linuxx64 = runtimes / "linux-x64" / "native";
140-
var linuxx86 = runtimes / "linux-x86" / "native";
141-
142-
var glob = string.Empty;
143-
var files = winx64.GlobFiles("*.dll")
144-
.Concat(winx86.GlobFiles("*.dll"))
145-
.Concat(linuxx64.GlobFiles("*.so"))
146-
.Concat(linuxx86.GlobFiles("*.so"));
147-
148-
glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
149-
150-
PrUpdatedNativeBinary
151-
(
152-
"DXVK", glob
153-
);
136+
PrUpdatedNativeBinary("DXVK");
154137
}
155138
)
156139
);
157-
}
140+
}

build/nuke/Native/SPIRVCross.cs

+1-13
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,7 @@ pub fn build(b: *std.Build) void {
144144
CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "libspirv-cross.dylib", runtimes / "osx-arm64" / "native" / "libspirv-cross.dylib", FileExistsPolicy.Overwrite);
145145
}
146146

147-
var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
148-
.Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
149-
.Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
150-
.Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
151-
.Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
152-
.Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
153-
.Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
154-
.Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
155-
156-
var glob = string.Empty;
157-
glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
158-
159-
PrUpdatedNativeBinary("SPIRV-Cross", glob);
147+
PrUpdatedNativeBinary("SPIRV-Cross");
160148
}
161149
)
162150
);

build/nuke/Native/SPIRVReflect.cs

+1-13
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,7 @@ pub fn build(b: *std.Build) void {
105105
CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "libspirv-reflect.dylib", runtimes / "osx-arm64" / "native" / "libspirv-reflect.dylib", FileExistsPolicy.Overwrite);
106106
}
107107

108-
var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
109-
.Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
110-
.Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
111-
.Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
112-
.Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
113-
.Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
114-
.Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
115-
.Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
116-
117-
var glob = string.Empty;
118-
glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
119-
120-
PrUpdatedNativeBinary("SPIRV-Reflect", glob);
108+
PrUpdatedNativeBinary("SPIRV-Reflect");
121109
}
122110
)
123111
);

build/nuke/Native/Shaderc.cs

+1-13
Original file line numberDiff line numberDiff line change
@@ -618,19 +618,7 @@ pub fn build(b: *std.Build) void {
618618
InheritedShell($"zig build -Dtarget=aarch64-macos {optimizeMode}", ShadercPath).AssertZeroExitCode();
619619
CopyFile(ShadercPath / "zig-out" / "lib" / $"lib{libname}.dylib", runtimes / "osx-arm64" / "native" / $"lib{libname}.dylib", FileExistsPolicy.Overwrite);
620620

621-
var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll")
622-
.Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll"))
623-
.Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll"))
624-
.Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib"))
625-
.Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib"))
626-
.Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so"))
627-
.Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so"))
628-
.Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so"));
629-
630-
var glob = string.Empty;
631-
glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
632-
633-
PrUpdatedNativeBinary("Shaderc", glob);
621+
PrUpdatedNativeBinary("Shaderc");
634622
}
635623
)
636624
);

build/nuke/Native/SwiftShader.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ partial class Build {
4242
var prepare = "cmake .. -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE";
4343
var build = $"cmake --build . --config Release{JobsArg}";
4444

45-
// Work around SwiftShader's silly Git hook installation logic that fails as a submodule.
45+
// Work around SwiftShader's silly Git hook installation logic that fails as a submodule
46+
// since `.git` is just a file containing a `gitdir` directive.
4647
File.WriteAllText(
4748
SwiftShaderPath / "CMakeLists.txt",
4849
File.ReadAllText(SwiftShaderPath / "CMakeLists.txt")
@@ -54,6 +55,7 @@ partial class Build {
5455
{
5556
("Win32", "win-x86"),
5657
("x64", "win-x64"),
58+
("ARM64", "win-arm64"),
5759
})
5860
{
5961
EnsureCleanDirectory(buildDir);

build/nuke/Native/VulkanLoader.cs

+10-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ partial class Build {
6060
}
6161
else if (OperatingSystem.IsLinux())
6262
{
63-
6463
foreach (var (triple, rid) in new[]
6564
{
6665
("x86_64-linux-gnu", "linux-x64"),
@@ -76,6 +75,16 @@ partial class Build {
7675

7776
CopyAll((buildDir / "loader").GlobFiles("libvulkan.so"), runtimes / rid / "native");
7877
}
78+
79+
// Build for win-arm64 with llvm-mingw.
80+
{
81+
EnsureCleanDirectory(buildDir);
82+
83+
InheritedShell($"{prepare} -DUSE_GAS=ON {GetCMakeToolchainFlag("aarch64-w64-mingw32")}", buildDir).AssertZeroExitCode();
84+
InheritedShell(build, buildDir).AssertZeroExitCode();
85+
86+
CopyAll((buildDir / "loader").GlobFiles("vulkan-1.dll"), runtimes / "win-arm64" / "native");
87+
}
7988
}
8089
else if (OperatingSystem.IsMacOS())
8190
{

build/submodules/SwiftShader

Submodule SwiftShader updated 29 files

src/Native/Directory.Build.targets

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<ItemGroup>
3+
<Content Include="build/**" PackagePath="build/%(RecursiveDir)%(Filename)%(Extension)" />
4+
<Content Include="runtimes/**" PackagePath="runtimes/%(RecursiveDir)%(Filename)%(Extension)" />
35
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/net461" />
46
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/netstandard2.0" />
57
</ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<SilkNativePackage>true</SilkNativePackage>
5-
</PropertyGroup>
6-
73
<Import Project="..\..\..\build\props\common.props" />
84

95
<PropertyGroup>
@@ -17,20 +13,6 @@
1713
<Description>Multi-platform native library for Assimp.</Description>
1814
<RepositoryType>git</RepositoryType>
1915
<RepositoryUrl>https://github.com/assimp/assimp</RepositoryUrl>
20-
<IncludeBuildOutput>false</IncludeBuildOutput>
21-
<IncludeContentInPack>true</IncludeContentInPack>
2216
</PropertyGroup>
2317

24-
<ItemGroup>
25-
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
26-
<Content Include="runtimes\linux-arm\native\libassimp.so.5" PackagePath="runtimes\linux-arm\native\libassimp.so.5" />
27-
<Content Include="runtimes\linux-arm64\native\libassimp.so.5" PackagePath="runtimes\linux-arm64\native\libassimp.so.5" />
28-
<Content Include="runtimes\linux-x64\native\libassimp.so.5" PackagePath="runtimes\linux-x64\native\libassimp.so.5" />
29-
<Content Include="runtimes\osx-arm64\native\libassimp.5.dylib" PackagePath="runtimes\osx-arm64\native\libassimp.5.dylib" />
30-
<Content Include="runtimes\osx-x64\native\libassimp.5.dylib" PackagePath="runtimes\osx-x64\native\libassimp.5.dylib" />
31-
<Content Include="runtimes\win-arm64\native\Assimp64.dll" PackagePath="runtimes\win-arm64\native\Assimp32.dll" />
32-
<Content Include="runtimes\win-x64\native\Assimp64.dll" PackagePath="runtimes\win-x64\native\Assimp64.dll" />
33-
<Content Include="runtimes\win-x86\native\Assimp32.dll" PackagePath="runtimes\win-x86\native\Assimp32.dll" />
34-
</ItemGroup>
35-
3618
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<SilkNativePackage>true</SilkNativePackage>
5-
</PropertyGroup>
6-
73
<Import Project="..\..\..\build\props\common.props" />
84

95
<PropertyGroup>
@@ -16,58 +12,6 @@
1612
<Description>Multi-platform native library for DXVK.</Description>
1713
<RepositoryType>git</RepositoryType>
1814
<RepositoryUrl>https://github.com/doitsujin/dxvk</RepositoryUrl>
19-
<IncludeBuildOutput>false</IncludeBuildOutput>
20-
<IncludeContentInPack>true</IncludeContentInPack>
2115
</PropertyGroup>
2216

23-
<ItemGroup>
24-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
25-
26-
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so"
27-
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so" />
28-
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so"
29-
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so" />
30-
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so"
31-
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so" />
32-
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so"
33-
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so" />
34-
35-
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so"
36-
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so" />
37-
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so"
38-
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so" />
39-
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so"
40-
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so" />
41-
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so"
42-
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so" />
43-
44-
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so"
45-
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so" />
46-
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so"
47-
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so" />
48-
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so"
49-
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so" />
50-
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so"
51-
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so" />
52-
53-
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so"
54-
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so" />
55-
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so"
56-
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so" />
57-
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so"
58-
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so" />
59-
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so"
60-
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so" />
61-
62-
<Content Include="runtimes\win-x64\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d11.dll" />
63-
<Content Include="runtimes\win-x64\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x64\native\dxvk-dxgi.dll" />
64-
<Content Include="runtimes\win-x64\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d9.dll" />
65-
<Content Include="runtimes\win-x64\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d10core.dll" />
66-
67-
<Content Include="runtimes\win-x86\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d11.dll" />
68-
<Content Include="runtimes\win-x86\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x86\native\dxvk-dxgi.dll" />
69-
<Content Include="runtimes\win-x86\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d9.dll" />
70-
<Content Include="runtimes\win-x86\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d10core.dll" />
71-
</ItemGroup>
72-
7317
</Project>

0 commit comments

Comments
 (0)