From 212b8b310810e5d5eebfa58af83b1343c4f4d51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 14 May 2024 22:40:41 +0200 Subject: [PATCH 1/3] Native/Assimp: Bump submodule to v5.4.1. --- build/submodules/Assimp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/submodules/Assimp b/build/submodules/Assimp index 6a08c39e3a..10df90ec14 160000 --- a/build/submodules/Assimp +++ b/build/submodules/Assimp @@ -1 +1 @@ -Subproject commit 6a08c39e3a91ef385e76515cfad86aca4bfd57ff +Subproject commit 10df90ec144179f97803a382e4f07c0570665864 From 886229bd14bf86dbfdd0447e5d167dc1a31b03b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 14 May 2024 22:42:42 +0200 Subject: [PATCH 2/3] Native/Assimp: Build with Draco support. --- build/nuke/Native/Assimp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/nuke/Native/Assimp.cs b/build/nuke/Native/Assimp.cs index bb09bc4351..e5921ae5ba 100644 --- a/build/nuke/Native/Assimp.cs +++ b/build/nuke/Native/Assimp.cs @@ -39,7 +39,7 @@ partial class Build { var buildDir = AssimpPath / "build"; var runtimes = RootDirectory / "src" / "Native" / "Silk.NET.Assimp.Native" / "runtimes"; - var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF"; + var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_DRACO_STATIC=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF"; var build = $"cmake --build . --config Release{JobsArg}"; if (OperatingSystem.IsWindows()) From 95a0b7509bfd5ee86e785c0aec56649e2fd5db34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 14 May 2024 23:03:41 +0200 Subject: [PATCH 3/3] Native/Assimp: Build with bundled and statically-linked zlib. Needed for Draco support. --- build/nuke/Native/Assimp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/nuke/Native/Assimp.cs b/build/nuke/Native/Assimp.cs index e5921ae5ba..30ab4e24e7 100644 --- a/build/nuke/Native/Assimp.cs +++ b/build/nuke/Native/Assimp.cs @@ -39,7 +39,7 @@ partial class Build { var buildDir = AssimpPath / "build"; var runtimes = RootDirectory / "src" / "Native" / "Silk.NET.Assimp.Native" / "runtimes"; - var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_DRACO_STATIC=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF"; + var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_DRACO_STATIC=ON -DASSIMP_BUILD_ZLIB=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF"; var build = $"cmake --build . --config Release{JobsArg}"; if (OperatingSystem.IsWindows())