From 279a924a025860df40caf712ed2fbb0549a0b1d2 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 19:53:11 +0100 Subject: [PATCH 1/6] Build linux using docker --- build/BuildLinuxTask.cs | 4 ++-- buildscripts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index c33892b..778c512 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,8 +12,8 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt" }); - context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); + context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); + context.StartProcessWithDocker("make", workingDirectory: buildWorkingDir, args: ""); context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } } diff --git a/buildscripts b/buildscripts index 43f13de..85bd209 160000 --- a/buildscripts +++ b/buildscripts @@ -1 +1 @@ -Subproject commit 43f13de8d1dd568f35eb9fe665fe4824e90a437d +Subproject commit 85bd2099140060dba373744e02282525aa8e876c From ce0c7c5ec71a74357638ab31ba173c43af5e51c9 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 20:00:38 +0100 Subject: [PATCH 2/6] Bump to v6.0.5 --- assimp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assimp b/assimp index 6a08c39..392a658 160000 --- a/assimp +++ b/assimp @@ -1 +1 @@ -Subproject commit 6a08c39e3a91ef385e76515cfad86aca4bfd57ff +Subproject commit 392a658f9c271be965271f45e7521a1b80ea4392 From 267862b5e28925f122e436faaf91a8cb7e26976e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 20:10:15 +0100 Subject: [PATCH 3/6] TRy this --- build/BuildLinuxTask.cs | 2 +- build/BuildWindowsTask.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index 778c512..b8b96a5 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,7 +12,7 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); + context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); context.StartProcessWithDocker("make", workingDirectory: buildWorkingDir, args: ""); context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index b05d0d6..138f82e 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -22,7 +22,7 @@ private void BuildForArchitecture(BuildContext context, string cmakeArch, string context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, - Arguments = $"-A {cmakeArch} -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF .." + Arguments = $"-A {cmakeArch} -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF .." }); context.ReplaceTextInFiles($"{buildWorkingDir}/code/assimp.vcxproj", "MultiThreadedDLL", "MultiThreaded"); @@ -34,6 +34,6 @@ private void BuildForArchitecture(BuildContext context, string cmakeArch, string }); context.CreateDirectory($"{context.ArtifactsDir}/{rid}"); - context.CopyFile($@"{buildWorkingDir}/bin/Release/assimp-vc143-mt.dll", $"{context.ArtifactsDir}/{rid}/assimp.dll"); + context.CopyFile($@"{buildWorkingDir}/bin/Release/assimp-vc145-mt.dll", $"{context.ArtifactsDir}/{rid}/assimp.dll"); } } From dfd292f626d84547430b6e70a1e90dbef5e447e8 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 20:44:18 +0100 Subject: [PATCH 4/6] ff --- build/BuildLinuxTask.cs | 2 +- build/BuildWindowsTask.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index b8b96a5..778c512 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,7 +12,7 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); + context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); context.StartProcessWithDocker("make", workingDirectory: buildWorkingDir, args: ""); context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index 138f82e..528139f 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -22,7 +22,7 @@ private void BuildForArchitecture(BuildContext context, string cmakeArch, string context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, - Arguments = $"-A {cmakeArch} -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF .." + Arguments = $"-A {cmakeArch} -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF .." }); context.ReplaceTextInFiles($"{buildWorkingDir}/code/assimp.vcxproj", "MultiThreadedDLL", "MultiThreaded"); From d907ef1fb22940bb30cb2e8798b2c6435493d4b5 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 21:01:26 +0100 Subject: [PATCH 5/6] ff --- build/BuildLinuxTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index 778c512..d554da8 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,7 +12,7 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt"); + context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DBUILD_SHARED_LIBS=ON CMakeLists.txt"); context.StartProcessWithDocker("make", workingDirectory: buildWorkingDir, args: ""); context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } From c87c7c2382c6d85b8eff4d9492c198cbdcf2a4c5 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sat, 11 Jul 2026 21:21:39 +0100 Subject: [PATCH 6/6] keep using vs2022 --- .github/workflows/main.yml | 2 +- build/BuildWindowsTask.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed3169e..3d91aba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] + os: [windows-2022, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] fail-fast: false steps: - name: Expose GitHub Runtime diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index 528139f..b05d0d6 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -34,6 +34,6 @@ private void BuildForArchitecture(BuildContext context, string cmakeArch, string }); context.CreateDirectory($"{context.ArtifactsDir}/{rid}"); - context.CopyFile($@"{buildWorkingDir}/bin/Release/assimp-vc145-mt.dll", $"{context.ArtifactsDir}/{rid}/assimp.dll"); + context.CopyFile($@"{buildWorkingDir}/bin/Release/assimp-vc143-mt.dll", $"{context.ArtifactsDir}/{rid}/assimp.dll"); } }