From cc8afbc220ab301385275ba948b08584ffd5d05b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 10 Oct 2024 21:28:30 +0200
Subject: [PATCH] Update Assimp for Mac

---
 Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a | 3 ---
 Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a | 4 ++--
 Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a   | 3 ---
 Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a   | 2 +-
 Source/ThirdParty/assimp/assimp.Build.cs                   | 1 -
 Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs        | 2 +-
 6 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a
 delete mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a

diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a
deleted file mode 100644
index 6bcd58a96..000000000
--- a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aa0849de08ac7f7332c63941b6ed028c329971b7d0ce9de44580e46b7560f2d
-size 519048
diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a
index 622b54e48..0aeab8ca5 100644
--- a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a
+++ b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05ed7fbba9701903c4d488eebda74ff71316af984bda5b125ff4822e53c05f3a
-size 66547240
+oid sha256:512690a2639b29649b19531e8f24f0e50600c5c225c674568d28e168b5078838
+size 7427096
diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a
deleted file mode 100644
index 792b3daf5..000000000
--- a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b67f00759cb59c91e5fe3fcf8bc107c6ac5f54c1929cea246892298ec40f6ec
-size 543624
diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a
index da1ab7c0b..ae7e0edd9 100644
--- a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a
+++ b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ead9834575a8b7dcab9f8539b59342a850d72d968ab4bdf6e1775510c7a38659
+oid sha256:1fc8320db7b98865e00e750277dec9aff82a3842454cb784d944c44b4aacfcbc
 size 7830128
diff --git a/Source/ThirdParty/assimp/assimp.Build.cs b/Source/ThirdParty/assimp/assimp.Build.cs
index dc0f0f06c..2276ca2e2 100644
--- a/Source/ThirdParty/assimp/assimp.Build.cs
+++ b/Source/ThirdParty/assimp/assimp.Build.cs
@@ -37,7 +37,6 @@ public class assimp : DepsModule
         case TargetPlatform.Linux:
         case TargetPlatform.Mac:
             options.OutputFiles.Add(Path.Combine(depsRoot, "libassimp.a"));
-            options.OutputFiles.Add(Path.Combine(depsRoot, "libIrrXML.a"));
             break;
         default: throw new InvalidPlatformException(options.Platform.Target);
         }
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
index 3cc1bacf0..f5bb8298c 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
@@ -136,12 +136,12 @@ namespace Flax.Deps.Dependencies
                     // Build for Mac
                     foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
                     {
+                        Utilities.Run("make", "clean", null, root, Utilities.RunOptions.ThrowExceptionOnError);
                         RunCmake(root, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + globalConfig);
                         Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError);
                         configHeaderFilePath = Path.Combine(root, "include", "assimp", "config.h");
                         var depsFolder = GetThirdPartyFolder(options, platform, architecture);
                         Utilities.FileCopy(Path.Combine(root, "lib", "libassimp.a"), Path.Combine(depsFolder, "libassimp.a"));
-                        Utilities.FileCopy(Path.Combine(root, "lib", "libIrrXML.a"), Path.Combine(depsFolder, "libIrrXML.a"));
                     }
                     break;
                 }