ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small repairs to get gpgx64 running again

This commit is contained in:
zeromus 2017-02-09 22:40:16 -06:00
parent 5bc643f1fd
commit 2e34d91869
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BizHawk.Client.Common/RomLoader.cs
View File

@ -12,6 +12,7 @@ using BizHawk.Emulation.Cores.ColecoVision;
using BizHawk.Emulation.Cores.Computers.Commodore64; using BizHawk.Emulation.Cores.Computers.Commodore64;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
using GPGX64=BizHawk.Emulation.Cores.Consoles.Sega.gpgx64;
using BizHawk.Emulation.Cores.Intellivision; using BizHawk.Emulation.Cores.Intellivision;
using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.GBA;
@ -474,9 +475,16 @@ namespace BizHawk.Client.Common
switch (game.System) switch (game.System)
{ {
case "GEN": case "GEN":
var genesis = new GPGX( if (Environment.Is64BitProcess)
nextComm, null, disc, GetCoreSettings<GPGX>(), GetCoreSyncSettings<GPGX>()); {
var genesis = new GPGX64.GPGX(nextComm, null, disc, GetCoreSettings<GPGX64.GPGX>(), GetCoreSyncSettings<GPGX64.GPGX>());
nextEmulator = genesis; nextEmulator = genesis;
}
else
{
var genesis = new GPGX(nextComm, null, disc, GetCoreSettings<GPGX>(), GetCoreSyncSettings<GPGX>());
nextEmulator = genesis;
}
break; break;
case "SAT": case "SAT":
nextEmulator = new Yabause(nextComm, disc, GetCoreSyncSettings<Yabause>()); nextEmulator = new Yabause(nextComm, disc, GetCoreSyncSettings<Yabause>());
@ -816,8 +824,11 @@ namespace BizHawk.Client.Common
nextEmulator.CoreComm.RomStatusDetails = "PSX etc."; nextEmulator.CoreComm.RomStatusDetails = "PSX etc.";
break; break;
case "GEN": case "GEN":
// discard "Genplus-gx64", auto-added due to implementing IEmulator // discard "Genplus-gx64", auto-added due to implementing IEmulator // HUH?
core = CoreInventory.Instance["GEN", "Genplus-gx"]; //core = CoreInventory.Instance["GEN", "Genplus-gx"];
if (Environment.Is64BitProcess)
core = CoreInventory.Instance["GEN", "Genplus-gx64"];
else core = CoreInventory.Instance["GEN", "Genplus-gx64"];
break; break;
} }