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

Core: Move Save types

This commit is contained in:
zilmar 2022-04-19 11:17:43 +09:30
parent e9d2b9793f
commit 016ded2b56
11 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Project64-core/N64System/Mips/Dma.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <Project64-core/Settings/DebugSettings.h>
#include <Project64-core/N64System/Mips/FlashRam.h>
#include <Project64-core/N64System/Mips/Sram.h>
#include <Project64-core\Settings\DebugSettings.h>
#include <Project64-core\N64System\SaveType\FlashRam.h>
#include <Project64-core\N64System\SaveType\Sram.h>
class CDMA :
private CDebugSettings

4
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -4,8 +4,8 @@
#include <Project64-core\N64System\Recompiler\RecompilerOps.h>
#include <Project64-core\N64System\Interpreter\InterpreterOps.h>
#include <Project64-core\N64System\Mips\PifRam.h>
#include <Project64-core\N64System\Mips\FlashRam.h>
#include <Project64-core\N64System\Mips\Sram.h>
#include <Project64-core\N64System\SaveType\FlashRam.h>
#include <Project64-core\N64System\SaveType\Sram.h>
#include <Project64-core\N64System\Mips\Dma.h>
#include <Project64-core\N64System\MemoryHandler\AudioInterfaceHandler.h>
#include <Project64-core\N64System\MemoryHandler\CartridgeDomain2Address1Handler.h>

4
Source/Project64-core/N64System/Mips/PifRam.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <Project64-core/Logging.h>
#include <Project64-core/N64System/Mips/Eeprom.h>
#include <Project64-core\Logging.h>
#include <Project64-core\N64System\SaveType\Eeprom.h>
class CPifRam :
public CLogging,

6
Source/Project64-core/N64System/Mips/Eeprom.cpp → Source/Project64-core/N64System/SaveType/Eeprom.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include <Project64-core/N64System/Mips/Eeprom.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64System.h>
#include <Project64-core\N64System\SaveType\Eeprom.h>
#include <Project64-core\N64System\SystemGlobals.h>
#include <Project64-core\N64System\N64System.h>
#include <time.h>
CEeprom::CEeprom(bool ReadOnly) :

0
Source/Project64-core/N64System/Mips/Eeprom.h → Source/Project64-core/N64System/SaveType/Eeprom.h
View File

8
Source/Project64-core/N64System/Mips/FlashRam.cpp → Source/Project64-core/N64System/SaveType/FlashRam.cpp
View File

@ -1,8 +1,8 @@
#include "stdafx.h"
#include <Project64-core/N64System/Mips/FlashRam.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Common/path.h>
#include <Project64-core\N64System\SaveType\FlashRam.h>
#include <Project64-core\N64System\SystemGlobals.h>
#include <Project64-core\N64System\Mips\MemoryVirtualMem.h>
#include <Common\path.h>
CFlashram::CFlashram(bool ReadOnly) :
m_FlashRamPointer(nullptr),

0
Source/Project64-core/N64System/Mips/FlashRam.h → Source/Project64-core/N64System/SaveType/FlashRam.h
View File

4
Source/Project64-core/N64System/Mips/Sram.cpp → Source/Project64-core/N64System/SaveType/Sram.cpp
View File

@ -1,6 +1,6 @@
#include "stdafx.h"
#include <Project64-core/N64System/Mips/Sram.h>
#include <Common/path.h>
#include <Project64-core\N64System\SaveType\Sram.h>
#include <Common\path.h>
CSram::CSram(bool ReadOnly) :
m_ReadOnly(ReadOnly)

0
Source/Project64-core/N64System/Mips/Sram.h → Source/Project64-core/N64System/SaveType/Sram.h
View File

9
Source/Project64-core/Project64-core.vcxproj
View File

@ -67,8 +67,6 @@
<ClCompile Include="N64System\MemoryHandler\VideoInterfaceHandler.cpp" />
<ClCompile Include="N64System\Mips\Disk.cpp" />
<ClCompile Include="N64System\Mips\Dma.cpp" />
<ClCompile Include="N64System\Mips\Eeprom.cpp" />
<ClCompile Include="N64System\Mips\FlashRam.cpp" />
<ClCompile Include="N64System\Mips\GBCart.cpp" />
<ClCompile Include="N64System\Mips\MemoryVirtualMem.cpp" />
<ClCompile Include="N64System\Mips\Mempak.cpp" />
@ -76,7 +74,6 @@
<ClCompile Include="N64System\Mips\PifRam.cpp" />
<ClCompile Include="N64System\Mips\Register.cpp" />
<ClCompile Include="N64System\Mips\Rumblepak.cpp" />
<ClCompile Include="N64System\Mips\Sram.cpp" />
<ClCompile Include="N64System\Mips\SystemEvents.cpp" />
<ClCompile Include="N64System\Mips\SystemTiming.cpp" />
<ClCompile Include="N64System\Mips\TLB.cpp" />
@ -101,6 +98,9 @@
<ClCompile Include="N64System\Recompiler\x86\x86ops.cpp" />
<ClCompile Include="N64System\Recompiler\x86\x86RecompilerOps.cpp" />
<ClCompile Include="N64System\Recompiler\x86\x86RegInfo.cpp" />
<ClCompile Include="N64System\SaveType\Eeprom.cpp" />
<ClCompile Include="N64System\SaveType\FlashRam.cpp" />
<ClCompile Include="N64System\SaveType\Sram.cpp" />
<ClCompile Include="N64System\SpeedLimiter.cpp" />
<ClCompile Include="N64System\SystemGlobals.cpp" />
<ClCompile Include="Plugins\AudioPlugin.cpp" />
@ -217,6 +217,9 @@
<ClInclude Include="N64System\Recompiler\x86\x86ops.h" />
<ClInclude Include="N64System\Recompiler\x86\x86RecompilerOps.h" />
<ClInclude Include="N64System\Recompiler\x86\x86RegInfo.h" />
<ClInclude Include="N64System\SaveType\Eeprom.h" />
<ClInclude Include="N64System\SaveType\FlashRam.h" />
<ClInclude Include="N64System\SaveType\Sram.h" />
<ClInclude Include="N64System\SpeedLimiter.h" />
<ClInclude Include="N64System\SystemGlobals.h" />
<ClInclude Include="Notification.h" />

33
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -100,6 +100,12 @@
<Filter Include="Source Files\N64 System\Plugins">
<UniqueIdentifier>{ac92e812-22e1-4a1a-8dd5-5055073c882c}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\N64 System\SaveType">
<UniqueIdentifier>{2413bbc1-6766-4c13-8a6f-da8840d096dd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\N64 System\SaveType">
<UniqueIdentifier>{f058be82-aec4-4e3d-a163-2eec0aa64feb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@ -246,12 +252,6 @@
<ClCompile Include="N64System\Mips\Dma.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
<ClCompile Include="N64System\Mips\Eeprom.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
<ClCompile Include="N64System\Mips\FlashRam.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
<ClCompile Include="N64System\Mips\MemoryVirtualMem.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
@ -270,9 +270,6 @@
<ClCompile Include="N64System\Mips\Rumblepak.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
<ClCompile Include="N64System\Mips\Sram.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
<ClCompile Include="N64System\Mips\SystemEvents.cpp">
<Filter>Source Files\N64 System\Mips</Filter>
</ClCompile>
@ -390,6 +387,15 @@
<ClCompile Include="N64System\MemoryHandler\PifRamHandler.cpp">
<Filter>Source Files\N64 System\MemoryHandler</Filter>
</ClCompile>
<ClCompile Include="N64System\SaveType\Eeprom.cpp">
<Filter>Source Files\N64 System\SaveType</Filter>
</ClCompile>
<ClCompile Include="N64System\SaveType\FlashRam.cpp">
<Filter>Source Files\N64 System\SaveType</Filter>
</ClCompile>
<ClCompile Include="N64System\SaveType\Sram.cpp">
<Filter>Source Files\N64 System\SaveType</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@ -746,6 +752,15 @@
<ClInclude Include="N64System\MemoryHandler\PifRamHandler.h">
<Filter>Header Files\N64 System\MemoryHandler</Filter>
</ClInclude>
<ClInclude Include="N64System\SaveType\Eeprom.h">
<Filter>Header Files\N64 System\SaveType</Filter>
</ClInclude>
<ClInclude Include="N64System\SaveType\FlashRam.h">
<Filter>Header Files\N64 System\SaveType</Filter>
</ClInclude>
<ClInclude Include="N64System\SaveType\Sram.h">
<Filter>Header Files\N64 System\SaveType</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Version.h.in">