From beb2fd34dbab62ff325ac28449d1ccaed5f5456a Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 19 Sep 2009 13:15:14 +0000
Subject: [PATCH] ZeroGS: Remove compiler errors under DXSDK Aug 2009.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1874 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/windows/VCprojects/pcsx2_2008.vcproj   | 2 +-
 plugins/zerogs/dx/GSmain.cpp                 | 2 +-
 plugins/zerogs/dx/Regs.cpp                   | 2 +-
 plugins/zerogs/dx/Windows/Conf.cpp           | 2 +-
 plugins/zerogs/dx/Windows/Win32.cpp          | 2 +-
 plugins/zerogs/dx/Windows/zerogs_2008.vcproj | 6 +++---
 plugins/zerogs/dx/targets.cpp                | 2 +-
 plugins/zerogs/dx/zerogs.cpp                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index 73dfb29cf8..eb7998b741 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -1184,7 +1184,7 @@
 							</Filter>
 						</Filter>
 						<Filter
-							Name="Interpretter"
+							Name="Interpreter"
 							>
 							<File
 								RelativePath="..\..\COP0.cpp"
diff --git a/plugins/zerogs/dx/GSmain.cpp b/plugins/zerogs/dx/GSmain.cpp
index 8ccb6c057c..9849021393 100644
--- a/plugins/zerogs/dx/GSmain.cpp
+++ b/plugins/zerogs/dx/GSmain.cpp
@@ -17,7 +17,7 @@
  */
 #if defined(_WIN32) || defined(_WIN32)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #endif
 
 #include <stdarg.h>
diff --git a/plugins/zerogs/dx/Regs.cpp b/plugins/zerogs/dx/Regs.cpp
index 5d094feba1..44338d7080 100644
--- a/plugins/zerogs/dx/Regs.cpp
+++ b/plugins/zerogs/dx/Regs.cpp
@@ -18,7 +18,7 @@
 
 #if defined(_WIN32) || defined(__WIN32__)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #endif
 
 #include <stdarg.h>
diff --git a/plugins/zerogs/dx/Windows/Conf.cpp b/plugins/zerogs/dx/Windows/Conf.cpp
index 904461f14e..c93a3bff90 100644
--- a/plugins/zerogs/dx/Windows/Conf.cpp
+++ b/plugins/zerogs/dx/Windows/Conf.cpp
@@ -1,6 +1,6 @@
 #if defined(_WIN32) || defined(__WIN32__)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #endif
 
 #include <stdlib.h>
diff --git a/plugins/zerogs/dx/Windows/Win32.cpp b/plugins/zerogs/dx/Windows/Win32.cpp
index baf04cc105..1672d8c503 100644
--- a/plugins/zerogs/dx/Windows/Win32.cpp
+++ b/plugins/zerogs/dx/Windows/Win32.cpp
@@ -1,6 +1,6 @@
 #if defined(_WIN32) || defined(__WIN32__)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #endif
 
 #include <stdio.h>
diff --git a/plugins/zerogs/dx/Windows/zerogs_2008.vcproj b/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
index da22f2bdc5..70bf3b1200 100644
--- a/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
+++ b/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib ddraw.lib dxerr9.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
+				AdditionalDependencies="zlib.lib ddraw.lib dxerr.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-dev.dll"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\"
@@ -133,7 +133,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib ddraw.lib dxerr9.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
+				AdditionalDependencies="zlib.lib ddraw.lib dxerr.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				AdditionalLibraryDirectories="..\"
 				IgnoreDefaultLibraryNames=""
@@ -212,7 +212,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib ddraw.lib dxerr9.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
+				AdditionalDependencies="zlib.lib ddraw.lib dxerr.lib dxguid.lib d3dx9.lib d3d9.lib odbc32.lib odbccp32.lib winmm.lib Vfw32.lib"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/plugins/zerogs/dx/targets.cpp b/plugins/zerogs/dx/targets.cpp
index 5ab52c8b70..e7b9b2ee6f 100644
--- a/plugins/zerogs/dx/targets.cpp
+++ b/plugins/zerogs/dx/targets.cpp
@@ -18,7 +18,7 @@
 
 #if defined(_WIN32) || defined(__WIN32__)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #endif
 
 #include <stdio.h>
diff --git a/plugins/zerogs/dx/zerogs.cpp b/plugins/zerogs/dx/zerogs.cpp
index 989bff2caf..67e307a598 100644
--- a/plugins/zerogs/dx/zerogs.cpp
+++ b/plugins/zerogs/dx/zerogs.cpp
@@ -18,7 +18,7 @@
 
 #if defined(_WIN32) || defined(__WIN32__)
 #include <d3dx9.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 #include <aviUtil.h>
 #endif