piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1002 from waddlesplash/wx-fixup

Browse Source 
WiiSaveCrypted: migrate to Core/HW.
This commit is contained in:
Lioncash 2014-09-08 15:20:12 -04:00
commit bf0c4a644b
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ set(SRCS ActionReplay.cpp
HW/WiimoteEmu/Encryption.cpp
HW/WiimoteEmu/Speaker.cpp
HW/WiimoteReal/WiimoteReal.cpp
HW/WiiSaveCrypted.cpp
IPC_HLE/ICMPLin.cpp
IPC_HLE/WII_IPC_HLE.cpp
IPC_HLE/WII_IPC_HLE_Device_DI.cpp

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

@ -165,6 +165,7 @@
<ClCompile Include="HW\WiimoteReal\IOWin.cpp" />
<ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp" />
<ClCompile Include="HW\WII_IPC.cpp" />
<ClCompile Include="HW\WiiSaveCrypted.cpp" />
<ClCompile Include="IPC_HLE\ICMPWin.cpp" />
<ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp" />
@ -360,6 +361,7 @@
<ClInclude Include="HW\WiimoteEmu\WiimoteHid.h" />
<ClInclude Include="HW\WiimoteReal\WiimoteReal.h" />
<ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" />
<ClInclude Include="HW\WiiSaveCrypted.h" />
<ClInclude Include="HW\WII_IPC.h" />
<ClInclude Include="IPC_HLE\hci.h" />
<ClInclude Include="IPC_HLE\ICMP.h" />

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

@ -511,6 +511,9 @@
<ClCompile Include="HW\SystemTimers.cpp">
<Filter>HW %28Flipper/Hollywood%29</Filter>
</ClCompile>
<ClCompile Include="HW\WiiSaveCrypted.cpp">
<Filter>HW %28Flipper/Hollywood%29</Filter>
</ClCompile>
<ClCompile Include="DSP\DSPAssembler.cpp">
<Filter>DSPCore</Filter>
</ClCompile>
@ -1026,6 +1029,9 @@
<ClInclude Include="HW\SystemTimers.h">
<Filter>HW %28Flipper/Hollywood%29</Filter>
</ClInclude>
<ClInclude Include="HW\WiiSaveCrypted.h">
<Filter>HW %28Flipper/Hollywood%29</Filter>
</ClInclude>
<ClInclude Include="DSP\DSPAssembler.h">
<Filter>DSPCore</Filter>
</ClInclude>

3
Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp → Source/Core/Core/HW/WiiSaveCrypted.cpp
View File

@ -24,7 +24,8 @@
#include "Common/StdMakeUnique.h"
#include "Common/StringUtil.h"
#include "Common/Crypto/ec.h"
#include "DolphinWX/MemoryCards/WiiSaveCrypted.h"
#include "Core/HW/WiiSaveCrypted.h"
static Common::replace_v replacements;

0
Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h → Source/Core/Core/HW/WiiSaveCrypted.h
View File

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

@ -56,7 +56,6 @@ set(GUI_SRCS
LogWindow.cpp
Main.cpp
MemcardManager.cpp
MemoryCards/WiiSaveCrypted.cpp
NetWindow.cpp
PatchAddEdit.cpp
PostProcessingConfigDiag.cpp

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

@ -88,7 +88,6 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="MemcardManager.cpp" />
<ClCompile Include="MemoryCards\WiiSaveCrypted.cpp" />
<ClCompile Include="NetWindow.cpp" />
<ClCompile Include="PatchAddEdit.cpp" />
<ClCompile Include="SoftwareVideoConfigDialog.cpp" />
@ -134,7 +133,6 @@
<ClInclude Include="LogWindow.h" />
<ClInclude Include="Main.h" />
<ClInclude Include="MemcardManager.h" />
<ClInclude Include="MemoryCards\WiiSaveCrypted.h" />
<ClInclude Include="NetWindow.h" />
<ClInclude Include="PatchAddEdit.h" />
<ClInclude Include="SoftwareVideoConfigDialog.h" />

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

@ -87,9 +87,6 @@
<ClCompile Include="NetWindow.cpp">
<Filter>GUI\NetPlay</Filter>
</ClCompile>
<ClCompile Include="MemoryCards\WiiSaveCrypted.cpp">
<Filter>GUI\Saves</Filter>
</ClCompile>
<ClCompile Include="Debugger\DebuggerPanel.cpp">
<Filter>GUI\Video</Filter>
</ClCompile>
@ -213,9 +210,6 @@
<ClInclude Include="NetWindow.h">
<Filter>GUI\NetPlay</Filter>
</ClInclude>
<ClInclude Include="MemoryCards\WiiSaveCrypted.h">
<Filter>GUI\Saves</Filter>
</ClInclude>
<ClInclude Include="Debugger\DebuggerPanel.h">
<Filter>GUI\Video</Filter>
</ClInclude>

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -54,6 +54,7 @@
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiiSaveCrypted.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
#include "Core/PowerPC/PowerPC.h"
@ -78,7 +79,6 @@
#include "DolphinWX/WXInputBase.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/CodeWindow.h"
#include "DolphinWX/MemoryCards/WiiSaveCrypted.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"

2
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -53,6 +53,7 @@
#include "Core/Movie.h"
#include "Core/Boot/Boot.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/WiiSaveCrypted.h"
#include "DiscIO/Blob.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
@ -63,7 +64,6 @@
#include "DolphinWX/ISOProperties.h"
#include "DolphinWX/Main.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/MemoryCards/WiiSaveCrypted.h"
#include "DolphinWX/resources/Flag_Europe.xpm"
#include "DolphinWX/resources/Flag_France.xpm"
#include "DolphinWX/resources/Flag_Germany.xpm"