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

iOS runtime impl progress

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-30 22:03:17 +02:00
parent d0bf176178
commit 5416d385d3
8 changed files with 162 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -1782,6 +1782,7 @@ static MonoAssembly* OnMonoAssemblyPreloadHook(MonoAssemblyName* aname, char** a
}
#if 0
static unsigned char* OnMonoLoadAOT(MonoAssembly* assembly, int size, void* user_data, void** out_handle)
{
MonoAssemblyName* assemblyName = mono_assembly_get_name(assembly);
@@ -1800,6 +1801,57 @@ static void OnMonoFreeAOT(MonoAssembly* assembly, int size, void* user_data, voi
LOG(Info, "Free AOT data for C# assembly {0}", String(assemblyNameStr));
#endif
}
#endif
#if PLATFORM_IOS
#include "Engine/Engine/Globals.h"
#include <mono/utils/mono-dl-fallback.h>
#include <dlfcn.h>
static void* OnMonoDlFallbackLoad(const char* name, int flags, char** err, void* user_data)
{
const String fileName = StringUtils::GetFileName(String(name));
#if DOTNET_HOST_MONO_DEBUG
LOG(Info, "Loading dynamic library {0}", fileName);
#endif
int dlFlags = 0;
if (flags & MONO_DL_GLOBAL && !(flags & MONO_DL_LOCAL))
dlFlags |= RTLD_GLOBAL;
else
dlFlags |= RTLD_LOCAL;
if (flags & MONO_DL_LAZY)
dlFlags |= RTLD_LAZY;
else
dlFlags |= RTLD_NOW;
void* result = dlopen(name, dlFlags);
if (!result)
{
// Try Frameworks location on iOS
String path = Globals::ProjectFolder / TEXT("Frameworks") / fileName;
if (!path.EndsWith(TEXT(".dylib")))
path += TEXT(".dylib");
result = dlopen(StringAsANSI<>(*path).Get(), dlFlags);
if (!result)
{
LOG(Error, "Failed to load dynamic libary {0}", String(name));
}
}
return result;
}
static void* OnMonoDlFallbackSymbol(void* handle, const char* name, char** err, void* user_data)
{
return dlsym(handle, name);
}
static void* OnMonoDlFallbackClose(void* handle, void* user_data)
{
dlclose(handle);
return 0;
}
#endif
bool InitHostfxr()
@@ -1815,6 +1867,12 @@ bool InitHostfxr()
// Enable AOT mode (per-platform)
mono_jit_set_aot_mode(USE_MONO_AOT_MODE);
#endif
// Platform-specific setup
#if PLATFORM_IOS
setenv("MONO_AOT_MODE", "aot", 1);
setenv("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1", 1);
#endif
#ifdef USE_MONO_AOT_MODULE
// Load AOT module
@@ -1916,6 +1974,9 @@ bool InitHostfxr()
#if 0
mono_install_load_aot_data_hook(OnMonoLoadAOT, OnMonoFreeAOT, nullptr);
#endif
#if PLATFORM_IOS
mono_dl_fallback_register(OnMonoDlFallbackLoad, OnMonoDlFallbackSymbol, OnMonoDlFallbackClose, nullptr);
#endif
// Init managed runtime
#if PLATFORM_ANDROID || PLATFORM_IOS

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

@@ -351,6 +351,12 @@ bool Scripting::LoadBinaryModules(const String& path, const String& projectFolde
{
nativePath = String(StringUtils::GetDirectoryName(Platform::GetExecutableFilePath())) / StringUtils::GetFileName(nativePath);
}
#elif PLATFORM_IOS
// iOS uses Frameworks folder with native binaries
if (!FileSystem::FileExists(nativePath))
{
nativePath = Globals::ProjectFolder / TEXT("Frameworks") / StringUtils::GetFileName(nativePath);
}
#endif
auto library = Platform::LoadLibrary(nativePath.Get());
if (!library)