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

Fix a crash when creating memory cards in Linux. Change the warnings when compiling GSdx in Linux to be a little less annoying. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4456 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-03-19 06:44:22 +00:00
parent 4f8bbb2c52
commit 13e2213f95
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
View File

@ -41,7 +41,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, const
, m_mcdpath( mcdpath ) , m_mcdpath( mcdpath )
, m_mcdfile( suggested_mcdfileName )//suggested_and_result_mcdfileName.IsEmpty() ? g_Conf->Mcd[slot].Filename.GetFullName() , m_mcdfile( suggested_mcdfileName )//suggested_and_result_mcdfileName.IsEmpty() ? g_Conf->Mcd[slot].Filename.GetFullName()
{ {
SetMinWidth( 472 ); SetMinWidth( 472 );
//m_filepicker = NULL; //m_filepicker = NULL;
@ -70,24 +70,24 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, const
{ {
s_padding += Heading( _( "New memory card:" ) ) | StdExpand(); s_padding += Heading( _( "New memory card:" ) ) | StdExpand();
s_padding += Heading( wxString(_("At folder: ")) + (m_mcdpath + m_mcdfile).GetPath() ).Unwrapped() | StdExpand(); s_padding += Heading( wxString(_("At folder: ")) + (m_mcdpath + m_mcdfile).GetPath() ).Unwrapped() | StdExpand();
wxBoxSizer& s_filename( *new wxBoxSizer(wxHORIZONTAL) ); wxBoxSizer& s_filename( *new wxBoxSizer(wxHORIZONTAL) );
s_filename += Heading( _("Select file name: ")).SetMinWidth(150); s_filename += Heading( _("Select file name: ")).SetMinWidth(150);
m_text_filenameInput->SetMinSize(wxSize(150,20)); m_text_filenameInput->SetMinSize(wxSize(150,20));
m_text_filenameInput->SetValue ((m_mcdpath + m_mcdfile).GetName()); m_text_filenameInput->SetValue ((m_mcdpath + m_mcdfile).GetName());
s_filename += m_text_filenameInput; s_filename += m_text_filenameInput;
s_filename += Heading( L".ps2" ); s_filename += Heading( L".ps2" );
s_padding += s_filename | wxALIGN_LEFT; s_padding += s_filename | wxALIGN_LEFT;
} }
s_padding += m_radio_CardSize | StdExpand(); s_padding += m_radio_CardSize | StdExpand();
#ifdef __WXMSW__ #ifdef __WXMSW__
if( m_check_CompressNTFS ) if( m_check_CompressNTFS )
s_padding += m_check_CompressNTFS | StdExpand(); s_padding += m_check_CompressNTFS | StdExpand();
#endif #endif
s_padding += 12; s_padding += 12;
s_padding += s_buttons | StdCenter(); s_padding += s_buttons | StdCenter();
@ -127,7 +127,7 @@ bool Dialogs::CreateMemoryCardDialog::CreateIt( const wxString& mcdFile, uint si
if( fp.Write( m_effeffs, sizeof(m_effeffs) ) == 0 ) if( fp.Write( m_effeffs, sizeof(m_effeffs) ) == 0 )
return false; return false;
} }
return true; return true;
} }
@ -183,13 +183,13 @@ void Dialogs::CreateMemoryCardDialog::CreateControls()
) )
); );
m_text_filenameInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
// Initial value of the checkbox is saved between calls to the dialog box. If the user checks // Initial value of the checkbox is saved between calls to the dialog box. If the user checks
// the option, it remains checked for future dialog. If the user unchecks it, ditto. // the option, it remains checked for future dialog. If the user unchecks it, ditto.
m_check_CompressNTFS->SetValue( g_Conf->McdCompressNTFS ); m_check_CompressNTFS->SetValue( g_Conf->McdCompressNTFS );
#endif #endif
m_text_filenameInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
const RadioPanelItem tbl_CardSizes[] = const RadioPanelItem tbl_CardSizes[] =
{ {
RadioPanelItem(_("8 MB [most compatible]"), _("This is the standard Sony-provisioned size, and is supported by all games and BIOS versions.")) RadioPanelItem(_("8 MB [most compatible]"), _("This is the standard Sony-provisioned size, and is supported by all games and BIOS versions."))

1
plugins/GSdx/GSdx.gcc.cbp
View File

@ -46,6 +46,7 @@
<Add option="-m32" /> <Add option="-m32" />
<Add option="-mpreferred-stack-boundary=2" /> <Add option="-mpreferred-stack-boundary=2" />
<Add option="-mfpmath=sse" /> <Add option="-mfpmath=sse" />
<Add option="-Wno-invalid-offsetof" />
<Add option="-D_LINUX" /> <Add option="-D_LINUX" />
</Compiler> </Compiler>
<Linker> <Linker>