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

MOvie LibRetro files from Emulation.Common to Emulation.Cores in preparation for moving some other things too. In RomLoader don't do HardReset() on the C64 core

This commit is contained in:
adelikat 2014-01-21 23:54:30 +00:00
parent b39577cc51
commit e3d26fc2e7
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ using System.IO;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Atari.Atari2600;
using BizHawk.Emulation.Cores.Atari.Atari7800;
using BizHawk.Emulation.Cores.Calculators;
@ -417,7 +418,6 @@ namespace BizHawk.Client.Common
break;
case "C64":
var c64 = new C64(nextComm, game, rom.RomData, rom.Extension);
c64.HardReset(); // TODO: The core should be responsible for this!
nextEmulator = c64;
break;
case "GBA":

2
BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -95,8 +95,6 @@
<Compile Include="Interfaces\ISoundProvider.cs" />
<Compile Include="Interfaces\ISyncSoundProvider.cs" />
<Compile Include="Interfaces\IVideoProvider.cs" />
<Compile Include="LibRetro.cs" />
<Compile Include="LibRetroEmulator.cs" />
<Compile Include="MemoryDomain.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\svnrev.cs" />

2
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -436,6 +436,8 @@
<Compile Include="Consoles\Sony\PSP\PSP.cs" />
<Compile Include="Consoles\Sony\PSX\LibMednahawkDll.cs" />
<Compile Include="Consoles\Sony\PSX\Octoshock.cs" />
<Compile Include="LibRetro.cs" />
<Compile Include="LibRetroEmulator.cs" />
<Compile Include="Properties\svnrev.cs" />
<Compile Include="Consoles\PC Engine\Input.cs" />
<Compile Include="Consoles\PC Engine\MemoryMap.cs" />

2
BizHawk.Emulation.Common/LibRetro.cs → BizHawk.Emulation.Cores/LibRetro.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Runtime.InteropServices;
using System.Reflection;
namespace BizHawk.Emulation.Common
namespace BizHawk.Emulation.Cores
{
/// <summary>
/// libretro related shims

4
BizHawk.Emulation.Common/LibRetroEmulator.cs → BizHawk.Emulation.Cores/LibRetroEmulator.cs
View File

@ -4,7 +4,9 @@ using System.Linq;
using System.Text;
using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Common
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
public unsafe class LibRetroEmulator : IEmulator, IVideoProvider
{