From e92bdf164c5d7033ecd703d64159d843f43dec7a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 22 Jul 2021 13:37:33 +0200 Subject: [PATCH] Fix Mono init on Switch --- Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp b/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp index cb8157e49..d0b43464b 100644 --- a/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp @@ -490,8 +490,7 @@ bool MCore::LoadEngine() MString configPathBuf = (Globals::MonoPath / TEXT("/etc/mono/config")).ToStringAnsi(); configPath = *configPathBuf; const MString assembliesPath = (Globals::MonoPath / TEXT("/lib/mono/4.5")).ToStringAnsi(); - //mono_set_assemblies_path(*assembliesPath); - //setenv("MONO_PATH", *assembliesPath, 1); + mono_set_assemblies_path(*assembliesPath); #endif mono_config_parse(configPath); @@ -523,6 +522,9 @@ bool MCore::LoadEngine() #if PLATFORM_UWP // Change the app root to Mono sub directory to prevent loading .Net Core assemblies from the AppX root folder configDir += "\\Mono"; +#elif PLATFORM_SWITCH + // Make config file path absolute + configFilename = exePath.ToStringAnsi() + ".config"; #endif mono_domain_set_config(monoRootDomain, configDir.Get(), configFilename.Get()); mono_thread_set_main(mono_thread_current());