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

Source/Core/Common/CMakeLists.txt

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

Source/Core/Common/Common.vcproj

@@ -532,6 +532,130 @@
 		<Filter
 			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
 				RelativePath=".\Src\Crypto\bn.cpp"
 				>

Source/Core/Common/Src/SConscript

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

Source/Core/DiscIO/CMakeLists.txt

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

Source/Core/DiscIO/Src/BannerLoader.cpp

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

Source/Core/DiscIO/Src/BannerLoaderGC.cpp

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

Source/Core/DiscIO/Src/BannerLoaderWii.cpp

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

Source/Core/DiscIO/Src/CompressedBlob.cpp

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

Source/Core/DiscIO/Src/DiscScrubber.cpp

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

Source/Core/DiscIO/Src/DriveBlob.cpp

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

Source/Core/DiscIO/Src/FileBlob.cpp

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

Source/Core/DiscIO/Src/FileHandlerARC.cpp

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

Source/Core/DiscIO/Src/FileMonitor.cpp

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

Source/Core/DiscIO/Src/FileSystemGCWii.cpp

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

Source/Core/DiscIO/Src/Filesystem.cpp

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