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

Oops, Make VS2010 project compile

This commit is contained in:
adelikat 2013-04-14 20:04:38 +00:00
parent e8eeb7f4fa
commit da80b7117a
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;VS2010</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>

2
BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
View File

@ -51,7 +51,7 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;VS2012</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>

4
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -301,7 +301,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
static ByteBuffer cpu_sequence_PAL = new ByteBuffer(new byte[]{4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3}); static ByteBuffer cpu_sequence_PAL = new ByteBuffer(new byte[]{4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3});
public int cpu_step, cpu_stepcounter, cpu_deadcounter; public int cpu_step, cpu_stepcounter, cpu_deadcounter;
#if VS2012
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
protected void RunCpuOne() protected void RunCpuOne()
{ {
cpu_stepcounter++; cpu_stepcounter++;
@ -336,7 +338,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
} }
} }
#if VS2012
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public byte ReadReg(int addr) public byte ReadReg(int addr)
{ {
switch (addr) switch (addr)

4
BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs
View File

@ -144,7 +144,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
idleSynch = true; idleSynch = true;
} }
#if VS2012
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
void TriggerNMI() void TriggerNMI()
{ {
nes.cpu.NMI = true; nes.cpu.NMI = true;
@ -165,7 +167,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
} }
} }
#if VS2012
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
void runppu(int x) void runppu(int x)
{ {
//run one ppu cycle at a time so we can interact with the ppu and clockPPU at high granularity //run one ppu cycle at a time so we can interact with the ppu and clockPPU at high granularity