From c1a818386f470f52da40308fd47dae2dfeaa739e Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 5 Sep 2009 23:46:08 +0000
Subject: [PATCH] wxgui: removed dependency on afxres.h, added
 resource/manifest versioning info to w32pthreads.v2.dll, and fixed a compile
 error.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1746 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/w32pthreads/pthreads_2008.vcproj | 32 +++++++++++++++++++++++
 pcsx2/gui/MainMenuClicks.cpp              |  7 ++++-
 pcsx2/windows/wxResources.rc              |  2 +-
 plugins/SPU2null/Windows/SPU2null.rc      |  8 +++---
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/3rdparty/w32pthreads/pthreads_2008.vcproj b/3rdparty/w32pthreads/pthreads_2008.vcproj
index 65a3181781..d79786dc9f 100644
--- a/3rdparty/w32pthreads/pthreads_2008.vcproj
+++ b/3rdparty/w32pthreads/pthreads_2008.vcproj
@@ -3948,6 +3948,10 @@
 				RelativePath=".\include\pthread.h"
 				>
 			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\sched.h"
 				>
@@ -3994,6 +3998,34 @@
 				RelativePath=".\PCSX2.txt"
 				>
 			</File>
+			<File
+				RelativePath=".\w32pthreads.v2.rc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="&quot;$(SvnRootDir)\common\include&quot;"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="&quot;$(SvnRootDir)\common\include&quot;"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Devel|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="&quot;$(SvnRootDir)\common\include&quot;"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index da663a471e..892d97c361 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -81,7 +81,12 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
 	SysExecute( new AppEmuThread(), g_Conf->CdvdSource );
 }
 
-extern const wxChar* isoFilterTypes;
+static const wxChar* isoFilterTypes =
+	L"All Supported (.iso .mdf .nrg .bin .img .dump)|*.iso;*.mdf;*.nrg;*.bin;*.img;*.dump|"
+	L"Disc Images (.iso .mdf .nrg .bin .img)|*.iso;*.mdf;*.nrg;*.bin;*.img|"
+	L"Blockdumps (.dump)|*.dump|"
+	L"All Files (*.*)|*.*";
+
 
 void MainEmuFrame::Menu_IsoBrowse_Click( wxCommandEvent &event )
 {
diff --git a/pcsx2/windows/wxResources.rc b/pcsx2/windows/wxResources.rc
index cb629c41c6..37a7d25d0d 100644
--- a/pcsx2/windows/wxResources.rc
+++ b/pcsx2/windows/wxResources.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "afxresmw.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/plugins/SPU2null/Windows/SPU2null.rc b/plugins/SPU2null/Windows/SPU2null.rc
index 0324fadb62..8150b2023a 100644
--- a/plugins/SPU2null/Windows/SPU2null.rc
+++ b/plugins/SPU2null/Windows/SPU2null.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "afxresmw.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -34,14 +34,12 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include ""afxresmw.h""\r\0"
 END
 
 3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
-    "\0"
+    "\r\0"
 END
 
 #endif    // APSTUDIO_INVOKED