From d103e829fa63555bb9db667dae95428778cbaea5 Mon Sep 17 00:00:00 2001
From: Marcus Wanners <marcus@wanners.net>
Date: Wed, 15 Jul 2009 18:56:19 +0000
Subject: [PATCH] Fixed Windows build problems caused by r3801.

The Windows build is still broken (for me at least) by r3797.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3805 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Core.vcproj                  | 84 ++++++++++++++++++-
 Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp |  2 +-
 .../Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp  |  2 +-
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index d9ce0fc178..df05ff5b2d 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -943,6 +943,14 @@
 		<Filter
 			Name="PowerPC"
 			>
+			<File
+				RelativePath=".\Src\PowerPC\CoreGeneralize.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PowerPC\CoreGeneralize.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\PowerPC\Gekko.h"
 				>
@@ -1158,6 +1166,26 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\Src\PowerPC\Jit64\Jit_Util.cpp"
+					>
+					<FileConfiguration
+						Name="Release_JITIL|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release_JITIL|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\Src\PowerPC\Jit64\Jit_Integer.cpp"
 					>
@@ -1862,6 +1890,58 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\Src\PowerPC\Jit64IL\Jit_Util.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugFast|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugFast|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\Src\PowerPC\Jit64IL\JitAsm.cpp"
 					>
@@ -1930,10 +2010,6 @@
 					RelativePath=".\Src\PowerPC\JitCommon\Jit_Tables.h"
 					>
 				</File>
-				<File
-					RelativePath=".\Src\PowerPC\JitCommon\Jit_Util.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\Src\PowerPC\JitCommon\JitBackpatch.cpp"
 					>
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
index ad7a7ff8f2..707f4d4acc 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
@@ -107,7 +107,7 @@ void AsmRoutineManager::Generate()
 				}
 				//grab from list and jump to it
 #ifdef _M_IX86
-				MOV(32, R(EDX), ImmPtr(jit.GetBlockCache()->GetCodePointers()));
+				MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
 				JMPptr(MComplex(EDX, EAX, 4, 0));
 #else
 				JMPptr(MComplex(R15, RAX, 8, 0));
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
index e266943e35..723369f6f0 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
@@ -109,7 +109,7 @@ void AsmRoutineManager::Generate()
 				}
 				//grab from list and jump to it
 #ifdef _M_IX86
-				MOV(32, R(EDX), ImmPtr(jit.GetBlockCache()->GetCodePointers()));
+				MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
 				JMPptr(MComplex(EDX, EAX, 4, 0));
 #else
 				JMPptr(MComplex(R15, RAX, 8, 0));