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

Add fallback location of engine managed library on AOT platforms

Browse Source
This commit is contained in:
Wojtek Figat
2025-11-20 14:58:30 -08:00
parent 7c91c03adf
commit 2a55cda583
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Scripting/Scripting.cpp
View File

@@ -568,10 +568,14 @@ bool Scripting::Load()
#endif #endif
// Load FlaxEngine // Load FlaxEngine
const String flaxEnginePath = Globals::BinariesFolder / TEXT("FlaxEngine.CSharp.dll");
auto* flaxEngineModule = (NativeBinaryModule*)GetBinaryModuleFlaxEngine(); auto* flaxEngineModule = (NativeBinaryModule*)GetBinaryModuleFlaxEngine();
if (!flaxEngineModule->Assembly->IsLoaded()) if (!flaxEngineModule->Assembly->IsLoaded())
{ {
String flaxEnginePath = Globals::BinariesFolder / TEXT("FlaxEngine.CSharp.dll");
#if USE_MONO_AOT
if (!FileSystem::FileExists(flaxEnginePath))
flaxEnginePath = Globals::BinariesFolder / TEXT("Dotnet") / TEXT("FlaxEngine.CSharp.dll");
#endif
if (flaxEngineModule->Assembly->Load(flaxEnginePath)) if (flaxEngineModule->Assembly->Load(flaxEnginePath))
{ {
LOG(Error, "Failed to load FlaxEngine C# assembly."); LOG(Error, "Failed to load FlaxEngine C# assembly.");