Look for libquicknes.dll/.so better

This commit is contained in:
YoshiRulz 2019-10-25 19:21:36 +10:00
parent d0159ee565
commit b904d3d71c
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 2 additions and 3 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,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Common.BizInvoke; using BizHawk.Common.BizInvoke;
@ -21,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
{ {
static QuickNES() static QuickNES()
{ {
Resolver = new DynamicLibraryImportResolver(LibQuickNES.dllname); Resolver = new DynamicLibraryImportResolver($"libquicknes{(OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows ? ".dll" : ".dll.so")}");
QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver, CallingConventionAdapters.Native); QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver, CallingConventionAdapters.Native);
QN.qn_setup_mappers(); QN.qn_setup_mappers();
} }