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

Update Assimp for Mac

Browse Source
This commit is contained in:
Wojtek Figat
2024-10-10 21:28:30 +02:00
parent 2d6257a390
commit cc8afbc220
6 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libIrrXML.a (Stored with Git LFS) vendored
View File

Binary file not shown.

BIN
Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libassimp.a (Stored with Git LFS) vendored
View File

Binary file not shown.

BIN
Source/Platforms/Mac/Binaries/ThirdParty/x64/libIrrXML.a (Stored with Git LFS) vendored
View File

Binary file not shown.

BIN
Source/Platforms/Mac/Binaries/ThirdParty/x64/libassimp.a (Stored with Git LFS) vendored
View File

Binary file not shown.

1
Source/ThirdParty/assimp/assimp.Build.cs vendored
View File

@@ -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);
}

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

@@ -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;
}