ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jake.Stine 2009-09-05 23:46:08 +00:00
parent 9308d86ffc
commit c1a818386f
4 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
3rdparty/w32pthreads/pthreads_2008.vcproj vendored
View File

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

7
pcsx2/gui/MainMenuClicks.cpp
View File

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

2
pcsx2/windows/wxResources.rc
View File

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

8
plugins/SPU2null/Windows/SPU2null.rc
View File

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