GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Assimp to v5.4.1

Browse Source 
#2727
This commit is contained in:
Wojtek Figat
2024-07-02 09:59:30 +02:00
parent ec510425a1
commit a79fb237e5
10 changed files with 75 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
View File

@@ -87,8 +87,7 @@ namespace Flax.Deps.Dependencies
var globalConfig = string.Join(" ", configs);
// Get the source
CloneGitRepoFast(root, "https://github.com/assimp/assimp.git");
GitCheckout(root, "master", "adff2f388a23f2192738470b094bb3197feb8ada");
CloneGitRepoSingleBranch(root, "https://github.com/assimp/assimp.git", "master", "10df90ec144179f97803a382e4f07c0570665864");
foreach (var platform in options.Platforms)
{
@@ -105,10 +104,9 @@ namespace Flax.Deps.Dependencies
// Build for Windows
File.Delete(Path.Combine(root, "CMakeCache.txt"));
foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{
var buildDir = Path.Combine(root, "build-" + architecture.ToString());
var buildDir = Path.Combine(root, "build-" + architecture);
var solutionPath = Path.Combine(buildDir, "Assimp.sln");
SetupDirectory(buildDir, true);
RunCmake(root, platform, architecture, $"-B\"{buildDir}\" -DLIBRARY_SUFFIX=-vc140-md -DUSE_STATIC_CRT=OFF " + globalConfig);

8
Source/Tools/Flax.Build/Deps/Dependency.cs
View File

@@ -68,10 +68,14 @@ namespace Flax.Deps
/// <param name="options">The options.</param>
/// <param name="platform">The target platform.</param>
/// <param name="architecture">The target architecture.</param>
/// <param name="createIfMissing">Auto-create directory if it's missing.</param>
/// <returns>The absolute path to the deps folder for the given platform and architecture configuration.</returns>
public static string GetThirdPartyFolder(BuildOptions options, TargetPlatform platform, TargetArchitecture architecture)
public static string GetThirdPartyFolder(BuildOptions options, TargetPlatform platform, TargetArchitecture architecture, bool createIfMissing = true)
{
return Path.Combine(options.PlatformsFolder, platform.ToString(), "Binaries", "ThirdParty", architecture.ToString());
var path = Path.Combine(options.PlatformsFolder, platform.ToString(), "Binaries", "ThirdParty", architecture.ToString());
if (createIfMissing && !Directory.Exists(path))
Directory.CreateDirectory(path);
return path;
}
/// <summary>