Skip to content

Commit

Permalink
More improvements to native library builds (#2143)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
alexrp and dotnet-bot authored Apr 21, 2024
1 parent 0f4cce8 commit f3087ca
Show file tree
Hide file tree
Showing 52 changed files with 101 additions and 372 deletions.
1 change: 1 addition & 0 deletions .github/workflows/assimp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/glfw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/openal-soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sdl2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/swiftshader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/vulkan-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build/cmake/aarch64-linux-gnu.cmake
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
12 changes: 12 additions & 0 deletions build/cmake/aarch64-w64-mingw32.cmake
Original file line number Diff line number Diff line change
@@ -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)
1 change: 1 addition & 0 deletions build/cmake/arm-linux-gnueabihf.cmake
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
1 change: 1 addition & 0 deletions build/cmake/x86_64-linux-gnu.cmake
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
16 changes: 2 additions & 14 deletions build/nuke/Native/Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
21 changes: 2 additions & 19 deletions build/nuke/Native/Dxvk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
)
);
}
}
14 changes: 1 addition & 13 deletions build/nuke/Native/SPIRVCross.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
)
);
Expand Down
14 changes: 1 addition & 13 deletions build/nuke/Native/SPIRVReflect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
)
);
Expand Down
14 changes: 1 addition & 13 deletions build/nuke/Native/Shaderc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
)
);
Expand Down
4 changes: 3 additions & 1 deletion build/nuke/Native/SwiftShader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -54,6 +55,7 @@ partial class Build {
{
("Win32", "win-x86"),
("x64", "win-x64"),
("ARM64", "win-arm64"),
})
{
EnsureCleanDirectory(buildDir);
Expand Down
11 changes: 10 additions & 1 deletion build/nuke/Native/VulkanLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ partial class Build {
}
else if (OperatingSystem.IsLinux())
{
foreach (var (triple, rid) in new[]
{
("x86_64-linux-gnu", "linux-x64"),
Expand All @@ -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())
{
Expand Down
2 changes: 1 addition & 1 deletion build/submodules/SwiftShader
Submodule SwiftShader updated 29 files
+11 −0 CMakeLists.txt
+7 −7 src/Device/Context.cpp
+2 −2 src/Reactor/Debug.cpp
+3 −3 src/System/Debug.cpp
+9 −1 src/Vulkan/VkRenderPass.cpp
+4 −0 third_party/llvm-10.0/configs/windows/include/llvm/Config/llvm-config.h
+1 −0 third_party/llvm-16.0/Android.bp
+50 −3 third_party/llvm-16.0/BUILD.gn
+32 −0 third_party/llvm-16.0/CMakeLists.txt
+2,353 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenAsmMatcher.inc
+2,204 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenAsmWriter.inc
+10,214 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenDAGISel.inc
+1,911 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenDisassemblerTables.inc
+5,980 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenInstrInfo.inc
+1,743 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenMCCodeEmitter.inc
+166 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenMCPseudoLowering.inc
+1,676 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenRegisterInfo.inc
+261 −0 third_party/llvm-16.0/configs/common/lib/Target/LoongArch/LoongArchGenSubtargetInfo.inc
+3 −0 third_party/llvm-16.0/configs/linux/include/llvm/Config/AsmParsers.def
+3 −0 third_party/llvm-16.0/configs/linux/include/llvm/Config/AsmPrinters.def
+3 −0 third_party/llvm-16.0/configs/linux/include/llvm/Config/Disassemblers.def
+3 −0 third_party/llvm-16.0/configs/linux/include/llvm/Config/Targets.def
+1 −1 third_party/llvm-16.0/configs/linux/include/llvm/Config/config.h
+18 −0 third_party/llvm-16.0/configs/linux/include/llvm/Config/llvm-config.h
+4 −0 third_party/llvm-16.0/configs/windows/include/llvm/Config/llvm-config.h
+14 −1 third_party/llvm-16.0/scripts/generate_build_files.py
+20 −0 third_party/llvm-16.0/scripts/template_BUILD.gn
+6 −0 third_party/llvm-16.0/scripts/template_CMakeLists.txt
+2 −0 third_party/llvm-16.0/scripts/update.py
2 changes: 2 additions & 0 deletions src/Native/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
18 changes: 0 additions & 18 deletions src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -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>
56 changes: 0 additions & 56 deletions src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -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>
Loading

0 comments on commit f3087ca

Please sign in to comment.