From ecf0c0411d918095b3ca2def83ad524fbe32e1a5 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 22 Jan 2026 22:00:15 +0000 Subject: [PATCH 1/4] Update CMake arguments for MacOS build Fixes MonoGame/MonoGame#9013 --- build/BuildMacOSTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 62ea882..2117944 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : 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 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir, "bin"), "libassimp.*.*.*.dylib", SearchOption.TopDirectoryOnly); context.CopyFile(files[0], $"{context.ArtifactsDir}/libassimp.dylib"); From e448813883dce6c53274783c37ea97d481fc401f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 22 Jan 2026 22:03:58 +0000 Subject: [PATCH 2/4] Fix cmake arguments formatting in BuildMacOSTask --- build/BuildMacOSTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 2117944..de88b34 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : 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 CMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir, "bin"), "libassimp.*.*.*.dylib", SearchOption.TopDirectoryOnly); context.CopyFile(files[0], $"{context.ArtifactsDir}/libassimp.dylib"); From 6044fccc49e4a01f47495ea0b7a371674decd47c Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 23 Jan 2026 00:01:26 +0000 Subject: [PATCH 3/4] Fix Mac build by not building zlib --- build/BuildMacOSTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index de88b34..de9cbe8 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : 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 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir, "bin"), "libassimp.*.*.*.dylib", SearchOption.TopDirectoryOnly); context.CopyFile(files[0], $"{context.ArtifactsDir}/libassimp.dylib"); From dddad13797a213391dbdea3867d44de2b87cd529 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 23 Jan 2026 10:01:36 +0000 Subject: [PATCH 4/4] Update Ubuntu version in CI workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f0eaef..48a74b6 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-20.04] + os: [windows-latest, macos-latest, ubuntu-22.04] fail-fast: false steps: - name: Expose GitHub Runtime