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

@@ -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>

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 )
 {

pcsx2/windows/wxResources.rc

@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "afxresmw.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

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"
+    "#include ""afxresmw.h""\r\0"
-    "\0"
 END
 
 3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
+    "\r\0"
-    "\0"
 END
 
 #endif    // APSTUDIO_INVOKED