piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move GCMemcard from DolphinWX/Memorycards to Core/HW

Browse Source
This commit is contained in:
LPFaint99
2011-10-04 10:51:13 -07:00
parent 8d91f1e0c1
commit 5316c6d97b
13 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/CMakeLists.txt
View File

@ -101,6 +101,7 @@ set(SRCS Src/ActionReplay.cpp
Src/HW/EXI_DeviceIPL.cpp Src/HW/EXI_DeviceIPL.cpp
Src/HW/EXI_DeviceMemoryCard.cpp Src/HW/EXI_DeviceMemoryCard.cpp
Src/HW/EXI_DeviceMic.cpp Src/HW/EXI_DeviceMic.cpp
Src/HW/GCMemcard.cpp
Src/HW/GCPad.cpp Src/HW/GCPad.cpp
Src/HW/GCPadEmu.cpp Src/HW/GCPadEmu.cpp
Src/HW/GPFifo.cpp Src/HW/GPFifo.cpp

2
Source/Core/Core/Core.vcxproj
View File

@ -287,6 +287,7 @@
<ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" /> <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
<ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" /> <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
<ClCompile Include="Src\HW\EXI_DeviceMic.cpp" /> <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
<ClCompile Include="Src\HW\GCMemcard.cpp" />
<ClCompile Include="Src\HW\GCPad.cpp" /> <ClCompile Include="Src\HW\GCPad.cpp" />
<ClCompile Include="Src\HW\GCPadEmu.cpp" /> <ClCompile Include="Src\HW\GCPadEmu.cpp" />
<ClCompile Include="Src\HW\GPFifo.cpp" /> <ClCompile Include="Src\HW\GPFifo.cpp" />
@ -483,6 +484,7 @@
<ClInclude Include="Src\HW\EXI_DeviceIPL.h" /> <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
<ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" /> <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
<ClInclude Include="Src\HW\EXI_DeviceMic.h" /> <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
<ClInclude Include="Src\HW\GCMemcard.h" />
<ClInclude Include="Src\HW\GCPad.h" /> <ClInclude Include="Src\HW\GCPad.h" />
<ClInclude Include="Src\HW\GCPadEmu.h" /> <ClInclude Include="Src\HW\GCPadEmu.h" />
<ClInclude Include="Src\HW\GPFifo.h" /> <ClInclude Include="Src\HW\GPFifo.h" />

9
Source/Core/Core/Core.vcxproj.filters
View File

@ -553,6 +553,9 @@
<Filter>FifoPlayer</Filter> <Filter>FifoPlayer</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Src\Movie.cpp" /> <ClCompile Include="Src\Movie.cpp" />
<ClCompile Include="Src\HW\GCMemcard.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Src\ConfigManager.h" /> <ClInclude Include="Src\ConfigManager.h" />
@ -1027,6 +1030,9 @@
<Filter>FifoPlayer</Filter> <Filter>FifoPlayer</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Src\Movie.h" /> <ClInclude Include="Src\Movie.h" />
<ClInclude Include="Src\HW\GCMemcard.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <None Include="CMakeLists.txt" />
@ -1165,5 +1171,8 @@
<Filter Include="FifoPlayer"> <Filter Include="FifoPlayer">
<UniqueIdentifier>{ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586}</UniqueIdentifier> <UniqueIdentifier>{ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="HW %28Flipper/Hollywood%29\GCMemcard">
<UniqueIdentifier>{3e9e6e83-c1bf-45f9-aeff-231f98f60d29}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
Source/Core/Core/SConscript
View File

@ -97,6 +97,7 @@ files = [
'Src/HW/EXI_DeviceIPL.cpp', 'Src/HW/EXI_DeviceIPL.cpp',
'Src/HW/EXI_DeviceMemoryCard.cpp', 'Src/HW/EXI_DeviceMemoryCard.cpp',
'Src/HW/EXI_DeviceMic.cpp', 'Src/HW/EXI_DeviceMic.cpp',
'Src/HW/GCMemcard.cpp',
'Src/HW/GCPad.cpp', 'Src/HW/GCPad.cpp',
'Src/HW/GCPadEmu.cpp', 'Src/HW/GCPadEmu.cpp',
'Src/HW/GPFifo.cpp', 'Src/HW/GPFifo.cpp',

2
Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
View File

@ -26,7 +26,7 @@
#include "EXI_Device.h" #include "EXI_Device.h"
#include "EXI_DeviceMemoryCard.h" #include "EXI_DeviceMemoryCard.h"
#include "Sram.h" #include "Sram.h"
#include "../../DolphinWx/Src/MemoryCards/GCMemcard.h" #include "GCMemcard.h"
#define MC_STATUS_BUSY 0x80 #define MC_STATUS_BUSY 0x80
#define MC_STATUS_UNLOCKED 0x40 #define MC_STATUS_UNLOCKED 0x40

0
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp → Source/Core/Core/Src/HW/GCMemcard.cpp
View File

4
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h → Source/Core/Core/Src/HW/GCMemcard.h
View File

@ -19,9 +19,9 @@
#define __GCMEMCARD_h__ #define __GCMEMCARD_h__
#include "Common.h" #include "Common.h"
#include "../../../Core/Src/HW/Sram.h" #include "Sram.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "../../../Core/Src/HW/EXI_DeviceIPL.h" #include "EXI_DeviceIPL.h"
#define BE32(x) (Common::swap32(x)) #define BE32(x) (Common::swap32(x))
#define BE16(x) (Common::swap16(x)) #define BE16(x) (Common::swap16(x))

1
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -52,7 +52,6 @@ if(wxWidgets_FOUND)
Src/LogWindow.cpp Src/LogWindow.cpp
Src/Main.cpp Src/Main.cpp
Src/MemcardManager.cpp Src/MemcardManager.cpp
Src/MemoryCards/GCMemcard.cpp
Src/MemoryCards/WiiSaveCrypted.cpp Src/MemoryCards/WiiSaveCrypted.cpp
Src/NetWindow.cpp Src/NetWindow.cpp
Src/PHackSettings.cpp Src/PHackSettings.cpp

2
Source/Core/DolphinWX/Dolphin.vcxproj
View File

@ -255,7 +255,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="Src\MemcardManager.cpp" /> <ClCompile Include="Src\MemcardManager.cpp" />
<ClCompile Include="Src\MemoryCards\GCMemcard.cpp" />
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" /> <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
<ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" /> <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
<ClCompile Include="Src\Debugger\MemoryView.cpp" /> <ClCompile Include="Src\Debugger\MemoryView.cpp" />
@ -309,7 +308,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
<ClInclude Include="Src\LogWindow.h" /> <ClInclude Include="Src\LogWindow.h" />
<ClInclude Include="Src\Main.h" /> <ClInclude Include="Src\Main.h" />
<ClInclude Include="Src\MemcardManager.h" /> <ClInclude Include="Src\MemcardManager.h" />
<ClInclude Include="Src\MemoryCards\GCMemcard.h" />
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" /> <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
<ClInclude Include="Src\Debugger\MemoryCheckDlg.h" /> <ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
<ClInclude Include="Src\Debugger\MemoryView.h" /> <ClInclude Include="Src\Debugger\MemoryView.h" />

6
Source/Core/DolphinWX/Dolphin.vcxproj.filters
View File

@ -6,9 +6,6 @@
<ClCompile Include="Src\stdafx.cpp" /> <ClCompile Include="Src\stdafx.cpp" />
<ClCompile Include="Src\WXInputBase.cpp" /> <ClCompile Include="Src\WXInputBase.cpp" />
<ClCompile Include="Src\WxUtils.cpp" /> <ClCompile Include="Src\WxUtils.cpp" />
<ClCompile Include="Src\MemoryCards\GCMemcard.cpp">
<Filter>GUI\Saves</Filter>
</ClCompile>
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp"> <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
<Filter>GUI\Saves</Filter> <Filter>GUI\Saves</Filter>
</ClCompile> </ClCompile>
@ -141,9 +138,6 @@
<ClInclude Include="Src\stdafx.h" /> <ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\WXInputBase.h" /> <ClInclude Include="Src\WXInputBase.h" />
<ClInclude Include="Src\WxUtils.h" /> <ClInclude Include="Src\WxUtils.h" />
<ClInclude Include="Src\MemoryCards\GCMemcard.h">
<Filter>GUI\Saves</Filter>
</ClInclude>
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h"> <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
<Filter>GUI\Saves</Filter> <Filter>GUI\Saves</Filter>
</ClInclude> </ClInclude>

1
Source/Core/DolphinWX/SConscript
View File

@ -43,7 +43,6 @@ else:
'Src/LogWindow.cpp', 'Src/LogWindow.cpp',
'Src/Main.cpp', 'Src/Main.cpp',
'Src/MemcardManager.cpp', 'Src/MemcardManager.cpp',
'Src/MemoryCards/GCMemcard.cpp',
'Src/MemoryCards/WiiSaveCrypted.cpp', 'Src/MemoryCards/WiiSaveCrypted.cpp',
'Src/NetWindow.cpp', 'Src/NetWindow.cpp',
'Src/PHackSettings.cpp', 'Src/PHackSettings.cpp',

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -27,6 +27,7 @@
#include "HW/SI.h" #include "HW/SI.h"
#include "HW/DSPHLE/DSPHLE.h" #include "HW/DSPHLE/DSPHLE.h"
#include "HW/DSPLLE/DSPLLE.h" #include "HW/DSPLLE/DSPLLE.h"
#include "HW/GCMemcard.h"
#include "IPC_HLE/WII_IPC_HLE.h" #include "IPC_HLE/WII_IPC_HLE.h"
#include "NANDContentLoader.h" #include "NANDContentLoader.h"
@ -37,7 +38,6 @@
#include "Frame.h" #include "Frame.h"
#include "HotkeyDlg.h" #include "HotkeyDlg.h"
#include "Main.h" #include "Main.h"
#include "MemoryCards/GCMemcard.h"
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)

2
Source/Core/DolphinWX/Src/MemcardManager.h
View File

@ -29,7 +29,7 @@
#include "IniFile.h" #include "IniFile.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "MemoryCards/GCMemcard.h" #include "HW/GCMemcard.h"
#undef MEMCARD_MANAGER_STYLE #undef MEMCARD_MANAGER_STYLE
#define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX