Look for libquicknes.dll/.so better

This commit is contained in:
YoshiRulz 2019-01-26 04:57:08 +10:00
parent e4b1567230
commit 0f5b4555b4
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 3 additions and 4 deletions

View File

@ -7,8 +7,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
{ {
public abstract class LibQuickNES public abstract class LibQuickNES
{ {
public const string dllname = "libquicknes.dll";
/// <summary> /// <summary>
/// setup extra mappers. should be done before anything else /// setup extra mappers. should be done before anything else
/// </summary> /// </summary>

View File

@ -3,8 +3,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using BizHawk.Emulation.Common; using BizHawk.Common;
using BizHawk.Common.BizInvoke; using BizHawk.Common.BizInvoke;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
{ {
@ -21,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
{ {
static QuickNES() static QuickNES()
{ {
Resolver = new DynamicLibraryImportResolver(LibQuickNES.dllname); Resolver = new DynamicLibraryImportResolver("libquicknes.dll" + (PlatformLinkedLibSingleton.RunningOnUnix ? ".so" : String.Empty));
QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver, CallingConventionAdapters.Native); QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver, CallingConventionAdapters.Native);
QN.qn_setup_mappers(); QN.qn_setup_mappers();
} }