From 13e2213f957b7e5c88c9b83f9386e5e616357021 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 19 Mar 2011 06:44:22 +0000
Subject: [PATCH] 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
---
 pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp | 16 ++++++++--------
 plugins/GSdx/GSdx.gcc.cbp                    |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
index 9a8af7fd4a..a3797b97c9 100644
--- a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
+++ b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
@@ -41,7 +41,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, const
 	, m_mcdpath( mcdpath )
 	, m_mcdfile( suggested_mcdfileName )//suggested_and_result_mcdfileName.IsEmpty() ? g_Conf->Mcd[slot].Filename.GetFullName()
 {
-	
+
 	SetMinWidth( 472 );
 	//m_filepicker	= NULL;
 
@@ -70,24 +70,24 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, const
 	{
 		s_padding += Heading( _( "New memory card:" ) )					| StdExpand();
 		s_padding += Heading( wxString(_("At folder:    ")) + (m_mcdpath + m_mcdfile).GetPath() ).Unwrapped()	| StdExpand();
-		
+
 		wxBoxSizer& s_filename( *new wxBoxSizer(wxHORIZONTAL) );
 		s_filename += Heading( _("Select file name: ")).SetMinWidth(150);
 		m_text_filenameInput->SetMinSize(wxSize(150,20));
 		m_text_filenameInput->SetValue ((m_mcdpath + m_mcdfile).GetName());
 		s_filename += m_text_filenameInput;
 		s_filename += Heading( L".ps2" );
-		
+
 		s_padding += s_filename | wxALIGN_LEFT;
 
 	}
-	
+
 	s_padding += m_radio_CardSize			| StdExpand();
 	#ifdef __WXMSW__
 	if( m_check_CompressNTFS )
 		s_padding += m_check_CompressNTFS	| StdExpand();
 	#endif
-	
+
 	s_padding += 12;
 	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 )
 			return false;
 	}
-	
+
 	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
 	// the option, it remains checked for future dialog.  If the user unchecks it, ditto.
 	m_check_CompressNTFS->SetValue( g_Conf->McdCompressNTFS );
 	#endif
 
+	m_text_filenameInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+
 	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."))
diff --git a/plugins/GSdx/GSdx.gcc.cbp b/plugins/GSdx/GSdx.gcc.cbp
index 1f84ae6a9c..2e1e041952 100644
--- a/plugins/GSdx/GSdx.gcc.cbp
+++ b/plugins/GSdx/GSdx.gcc.cbp
@@ -46,6 +46,7 @@
 			<Add option="-m32" />
 			<Add option="-mpreferred-stack-boundary=2" />
 			<Add option="-mfpmath=sse" />
+			<Add option="-Wno-invalid-offsetof" />
 			<Add option="-D_LINUX" />
 		</Compiler>
 		<Linker>