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

Move AES to common lib 

move pch includes to vcproj file for discio

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6643 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99 2010-12-22 06:00:36 +00:00
parent 9bbe7a9e1a
commit 6c556786fb
29 changed files with 141 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/CMakeLists.txt
View File

@ -30,6 +30,8 @@ set(SRCS Src/ABI.cpp
Src/Version.cpp Src/Version.cpp
Src/x64Analyzer.cpp Src/x64Analyzer.cpp
Src/x64Emitter.cpp Src/x64Emitter.cpp
Src/Crypto/aes_cbc.cpp
Src/Crypto/aes_core.cpp
Src/Crypto/bn.cpp Src/Crypto/bn.cpp
Src/Crypto/ec.cpp Src/Crypto/ec.cpp
Src/Crypto/md5.cpp Src/Crypto/md5.cpp

124
Source/Core/Common/Common.vcproj
View File

@ -532,6 +532,130 @@
<Filter <Filter
Name="Crypto" Name="Crypto"
> >
<File
RelativePath=".\Src\Crypto\aes.h"
>
</File>
<File
RelativePath=".\Src\Crypto\aes_cbc.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\Crypto\aes_core.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\Crypto\aes_locl.h"
>
</File>
<File <File
RelativePath=".\Src\Crypto\bn.cpp" RelativePath=".\Src\Crypto\bn.cpp"
> >

0
Source/Core/DiscIO/Src/AES/aes.h → Source/Core/Common/Src/Crypto/aes.h
View File

0
Source/Core/DiscIO/Src/AES/aes_cbc.c → Source/Core/Common/Src/Crypto/aes_cbc.c
View File

0
Source/Core/DiscIO/Src/AES/aes_core.c → Source/Core/Common/Src/Crypto/aes_core.c
View File

0
Source/Core/DiscIO/Src/AES/aes_locl.h → Source/Core/Common/Src/Crypto/aes_locl.h
View File

2
Source/Core/Common/Src/SConscript
View File

@ -42,6 +42,8 @@ files = [
"Version.cpp", "Version.cpp",
"x64Emitter.cpp", "x64Emitter.cpp",
"x64Analyzer.cpp", "x64Analyzer.cpp",
"Crypto/aes_cbc.cpp",
"Crypto/aes_core.cpp",
"Crypto/bn.cpp", "Crypto/bn.cpp",
"Crypto/ec.cpp", "Crypto/ec.cpp",
"Crypto/md5.cpp", "Crypto/md5.cpp",

4
Source/Core/DiscIO/CMakeLists.txt
View File

@ -17,9 +17,7 @@ set(SRCS Src/BannerLoader.cpp
Src/VolumeGC.cpp Src/VolumeGC.cpp
Src/VolumeWad.cpp Src/VolumeWad.cpp
Src/VolumeWiiCrypted.cpp Src/VolumeWiiCrypted.cpp
Src/WiiWad.cpp Src/WiiWad.cpp)
Src/AES/aes_cbc.c
Src/AES/aes_core.c)
add_library(discio STATIC ${SRCS}) add_library(discio STATIC ${SRCS})
target_link_libraries(discio common) target_link_libraries(discio common)

668
Source/Core/DiscIO/DiscIO.vcproj
View File

@ -53,7 +53,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="4"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -118,7 +118,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -180,7 +180,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -244,7 +244,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -306,7 +306,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -368,7 +368,7 @@
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -402,134 +402,6 @@
<References> <References>
</References> </References>
<Files> <Files>
<Filter
Name="AES"
>
<File
RelativePath=".\Src\AES\aes.h"
>
</File>
<File
RelativePath=".\Src\AES\aes_cbc.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\AES\aes_core.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ForcedIncludeFiles=" "
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\AES\aes_locl.h"
>
</File>
</Filter>
<Filter <Filter
Name="Volume" Name="Volume"
> >
@ -548,106 +420,10 @@
<File <File
RelativePath=".\Src\VolumeCommon.cpp" RelativePath=".\Src\VolumeCommon.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\VolumeCreator.cpp" RelativePath=".\Src\VolumeCreator.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\VolumeCreator.h" RelativePath=".\Src\VolumeCreator.h"
@ -664,54 +440,6 @@
<File <File
RelativePath=".\Src\VolumeGC.cpp" RelativePath=".\Src\VolumeGC.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\VolumeGC.h" RelativePath=".\Src\VolumeGC.h"
@ -728,54 +456,6 @@
<File <File
RelativePath=".\Src\VolumeWiiCrypted.cpp" RelativePath=".\Src\VolumeWiiCrypted.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\VolumeWiiCrypted.h" RelativePath=".\Src\VolumeWiiCrypted.h"
@ -787,54 +467,6 @@
<File <File
RelativePath=".\Src\Blob.cpp" RelativePath=".\Src\Blob.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\Blob.h" RelativePath=".\Src\Blob.h"
@ -872,54 +504,6 @@
<File <File
RelativePath=".\Src\Filesystem.cpp" RelativePath=".\Src\Filesystem.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\Filesystem.h" RelativePath=".\Src\Filesystem.h"
@ -928,54 +512,6 @@
<File <File
RelativePath=".\Src\FileSystemGCWii.cpp" RelativePath=".\Src\FileSystemGCWii.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\FileSystemGCWii.h" RelativePath=".\Src\FileSystemGCWii.h"
@ -988,54 +524,6 @@
<File <File
RelativePath=".\Src\BannerLoader.cpp" RelativePath=".\Src\BannerLoader.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\BannerLoader.h" RelativePath=".\Src\BannerLoader.h"
@ -1044,54 +532,6 @@
<File <File
RelativePath=".\Src\BannerLoaderGC.cpp" RelativePath=".\Src\BannerLoaderGC.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\BannerLoaderGC.h" RelativePath=".\Src\BannerLoaderGC.h"
@ -1100,54 +540,6 @@
<File <File
RelativePath=".\Src\BannerLoaderWii.cpp" RelativePath=".\Src\BannerLoaderWii.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\BannerLoaderWii.h" RelativePath=".\Src\BannerLoaderWii.h"
@ -1156,54 +548,6 @@
<File <File
RelativePath=".\Src\FileHandlerARC.cpp" RelativePath=".\Src\FileHandlerARC.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
ForcedIncludeFiles="stdafx.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\Src\FileHandlerARC.h" RelativePath=".\Src\FileHandlerARC.h"

1
Source/Core/DiscIO/Src/BannerLoader.cpp
View File

@ -14,7 +14,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "BannerLoader.h" #include "BannerLoader.h"
#include "BannerLoaderWii.h" #include "BannerLoaderWii.h"

2
Source/Core/DiscIO/Src/BannerLoaderGC.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
// HyperIris: need clean code // HyperIris: need clean code
#include "../../Core/Src/ConfigManager.h" #include "../../Core/Src/ConfigManager.h"

4
Source/Core/DiscIO/Src/BannerLoaderWii.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include <stdio.h> #include <stdio.h>
#include "Common.h" #include "Common.h"
@ -211,4 +209,4 @@ void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height)
} }
} }
} // namespace } // namespace

2
Source/Core/DiscIO/Src/CompressedBlob.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>

2
Source/Core/DiscIO/Src/DiscScrubber.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Filesystem.h" #include "Filesystem.h"
#include "VolumeCreator.h" #include "VolumeCreator.h"
#include "FileUtil.h" #include "FileUtil.h"

1
Source/Core/DiscIO/Src/DriveBlob.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "DriveBlob.h" #include "DriveBlob.h"
namespace DiscIO namespace DiscIO

2
Source/Core/DiscIO/Src/FileBlob.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Blob.h" #include "Blob.h"
#include "FileBlob.h" #include "FileBlob.h"
#include "FileUtil.h" #include "FileUtil.h"

1
Source/Core/DiscIO/Src/FileHandlerARC.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Common.h" #include "Common.h"
#include "FileHandlerARC.h" #include "FileHandlerARC.h"

7
Source/Core/DiscIO/Src/FileMonitor.cpp
View File

@ -15,18 +15,13 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
// -----------
// Include
#include "stdafx.h"
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include "Common.h" // Common #include "Common.h"
#include "IniFile.h" #include "IniFile.h"
#include "LogManager.h" #include "LogManager.h"

1
Source/Core/DiscIO/Src/FileSystemGCWii.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Common.h" #include "Common.h"
#include "FileUtil.h" #include "FileUtil.h"

1
Source/Core/DiscIO/Src/Filesystem.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Filesystem.h" #include "Filesystem.h"
#include "VolumeCreator.h" #include "VolumeCreator.h"

3
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -15,12 +15,11 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "NANDContentLoader.h" #include "NANDContentLoader.h"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include "AES/aes.h" #include "Crypto/aes.h"
#include "MathUtil.h" #include "MathUtil.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "Log.h" #include "Log.h"

2
Source/Core/DiscIO/Src/SConscript
View File

@ -23,8 +23,6 @@ files = [
'FileMonitor.cpp', 'FileMonitor.cpp',
'NANDContentLoader.cpp', 'NANDContentLoader.cpp',
'WiiWad.cpp', 'WiiWad.cpp',
'AES/aes_cbc.c',
'AES/aes_core.c',
] ]
libs = [ libs = [

2
Source/Core/DiscIO/Src/VolumeCreator.cpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include "AES/aes.h" #include "Crypto/aes.h"
#include "VolumeCreator.h" #include "VolumeCreator.h"

1
Source/Core/DiscIO/Src/VolumeDirectory.cpp
View File

@ -14,7 +14,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "Common.h" #include "Common.h"
#include "CommonPaths.h" #include "CommonPaths.h"

1
Source/Core/DiscIO/Src/VolumeWad.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include <math.h> #include <math.h>
#include "VolumeWad.h" #include "VolumeWad.h"

2
Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "VolumeWiiCrypted.h" #include "VolumeWiiCrypted.h"
#include "StringUtil.h" #include "StringUtil.h"

2
Source/Core/DiscIO/Src/VolumeWiiCrypted.h
View File

@ -20,7 +20,7 @@
#include "Volume.h" #include "Volume.h"
#include "Blob.h" #include "Blob.h"
#include "AES/aes.h" #include "Crypto/aes.h"
// --- this volume type is used for encrypted Wii images --- // --- this volume type is used for encrypted Wii images ---

1
Source/Core/DiscIO/Src/WiiWad.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "NANDContentLoader.h" #include "NANDContentLoader.h"
#include <algorithm> #include <algorithm>

2
Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
View File

@ -18,8 +18,8 @@
#ifndef _WII_SAVE_CRYPTED #ifndef _WII_SAVE_CRYPTED
#define _WII_SAVE_CRYPTED #define _WII_SAVE_CRYPTED
#include "AES/aes.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "Crypto/aes.h"
#include "Crypto/tools.h" #include "Crypto/tools.h"
#include "Crypto/md5.h" #include "Crypto/md5.h"