diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so new file mode 120000 index 000000000..9a02130ad --- /dev/null +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so @@ -0,0 +1 @@ +libassimp.so.4.1.0 \ No newline at end of file diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so.4 b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so.4 new file mode 120000 index 000000000..9a02130ad --- /dev/null +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.so.4 @@ -0,0 +1 @@ +libassimp.so.4.1.0 \ No newline at end of file diff --git a/Source/ThirdParty/assimp/assimp.Build.cs b/Source/ThirdParty/assimp/assimp.Build.cs index 54a5253f8..b5470c90c 100644 --- a/Source/ThirdParty/assimp/assimp.Build.cs +++ b/Source/ThirdParty/assimp/assimp.Build.cs @@ -32,6 +32,9 @@ public class assimp : DepsModule options.DelayLoadLibraries.Add("assimp-vc140-md.dll"); break; case TargetPlatform.Linux: + options.DependencyFiles.Add(Path.Combine(depsRoot, "libassimp.so")); + options.DependencyFiles.Add(Path.Combine(depsRoot, "libassimp.so.4")); + options.DependencyFiles.Add(Path.Combine(depsRoot, "libassimp.so.4.1.0")); options.Libraries.Add(Path.Combine(depsRoot, "libassimp.so")); 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 a2e17cf84..599c392d9 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs @@ -73,10 +73,10 @@ namespace Flax.Deps.Dependencies case TargetPlatform.Linux: { // Build for Linux - RunCmake(root, TargetPlatform.Linux, TargetArchitecture.x64); + RunCmake(root, TargetPlatform.Linux, TargetArchitecture.x64, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_NO_EXPORT=ON -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF"); Utilities.Run("make", null, null, root, Utilities.RunOptions.None); var depsFolder = GetThirdPartyFolder(options, TargetPlatform.Linux, TargetArchitecture.x64); - Utilities.FileCopy(Path.Combine(root, "lib", "libassimp.so"), Path.Combine(depsFolder, "libassimp.so")); + Utilities.FileCopy(Path.Combine(root, "lib", "libassimp.so.4.1.0"), Path.Combine(depsFolder, "libassimp.so.4.1.0")); break; } }