From 2d6257a3902252c0492c41a3477241e8b843f6d4 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 10 Oct 2024 20:32:44 +0200 Subject: [PATCH] Revert "Update Assimp lib for Linux" This reverts commit 0fcd6a194a9f4af5706a83b9b90ca337088a1f49. --- Source/Platforms/Linux/Binaries/ThirdParty/x64/libIrrXML.a | 3 +++ Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a | 4 ++-- Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a | 3 +++ Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a | 3 +++ Source/ThirdParty/assimp/assimp.Build.cs | 1 + Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Source/Platforms/Linux/Binaries/ThirdParty/x64/libIrrXML.a create mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a create mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libIrrXML.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libIrrXML.a new file mode 100644 index 000000000..92c1baf0b --- /dev/null +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libIrrXML.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb25101716011a5b4c872c5cd303c3292a61e5f661e9296d95502b5705e2e53 +size 181458 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a index 8680fe1af..4dccc7f4b 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc6f4d94de6fccc854c5ec2cfc98b6516391448f92e9a1ecab6b24709e0c6f87 -size 10378226 +oid sha256:8cbd73a154e270cc03d3da292b2c3cc73ee473b221f43722d060dc114916d6d5 +size 7996212 diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a new file mode 100644 index 000000000..6bcd58a96 --- /dev/null +++ b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aa0849de08ac7f7332c63941b6ed028c329971b7d0ce9de44580e46b7560f2d +size 519048 diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a new file mode 100644 index 000000000..792b3daf5 --- /dev/null +++ b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b67f00759cb59c91e5fe3fcf8bc107c6ac5f54c1929cea246892298ec40f6ec +size 543624 diff --git a/Source/ThirdParty/assimp/assimp.Build.cs b/Source/ThirdParty/assimp/assimp.Build.cs index 2276ca2e2..dc0f0f06c 100644 --- a/Source/ThirdParty/assimp/assimp.Build.cs +++ b/Source/ThirdParty/assimp/assimp.Build.cs @@ -37,6 +37,7 @@ 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 8712839eb..3cc1bacf0 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs @@ -128,6 +128,7 @@ namespace Flax.Deps.Dependencies configHeaderFilePath = Path.Combine(root, "include", "assimp", "config.h"); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); 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; } case TargetPlatform.Mac: @@ -140,6 +141,7 @@ namespace Flax.Deps.Dependencies 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; }