From 0f5b4555b4e2e7080152acc9bae5730bcf620cde Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 26 Jan 2019 04:57:08 +1000 Subject: [PATCH] Look for libquicknes.dll/.so better --- .../Consoles/Nintendo/QuickNES/LibQuickNES.cs | 2 -- .../Consoles/Nintendo/QuickNES/QuickNES.cs | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs index edd891063b..9177223993 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs @@ -7,8 +7,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { public abstract class LibQuickNES { - public const string dllname = "libquicknes.dll"; - /// /// setup extra mappers. should be done before anything else /// diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 899ae0254f..7023f44ec9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using BizHawk.Emulation.Common; +using BizHawk.Common; using BizHawk.Common.BizInvoke; +using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { @@ -21,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { static QuickNES() { - Resolver = new DynamicLibraryImportResolver(LibQuickNES.dllname); + Resolver = new DynamicLibraryImportResolver("libquicknes.dll" + (PlatformLinkedLibSingleton.RunningOnUnix ? ".so" : String.Empty)); QN = BizInvoker.GetInvoker(Resolver, CallingConventionAdapters.Native); QN.qn_setup_mappers(); }