From 3c8c761cca600a2315ad4279b6cdebd329d092cc Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 6 Oct 2019 16:22:05 +1000 Subject: [PATCH] Subscribe to CurrentDomain.AssemblyResolve on Unix This is so DLLs not in the executing directory can be found without having to copy to local, i.e. Nlua.dll and KopiLua.dll --Asnivor --- BizHawk.Client.EmuHawk/Program.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs index 8da6077bbf..eff505836a 100644 --- a/BizHawk.Client.EmuHawk/Program.cs +++ b/BizHawk.Client.EmuHawk/Program.cs @@ -75,6 +75,11 @@ namespace BizHawk.Client.EmuHawk //We need to do it here too... otherwise people get exceptions when externaltools we distribute try to startup } + else + { + // for Unix, skip everything else and just wire up the event handler + AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; + } } [STAThread]