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

Revert "Update Assimp lib for Linux"

Browse Source 
This reverts commit 0fcd6a194a.
This commit is contained in:
Wojtek Figat
2024-10-10 20:32:44 +02:00
parent 0fcd6a194a
commit 2d6257a390
6 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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

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

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