From 0fb724295bb1f43a372fa17b7c930bd9db7cb7f1 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 20 May 2010 20:46:13 +0000 Subject: [PATCH] Quick Linux fixes. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3051 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/build/Utilities/Utilities.cbp | 2 ++ pcsx2/Linux/pcsx2.cbp | 1 + pcsx2/R5900.cpp | 2 +- pcsx2/gui/Panels/MemoryCardListView.cpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp index 0537ff1ca7..87254b9f90 100644 --- a/common/build/Utilities/Utilities.cbp +++ b/common/build/Utilities/Utilities.cbp @@ -180,6 +180,7 @@ + @@ -197,6 +198,7 @@ + diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 9b08d28f33..06ccbab69c 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -413,6 +413,7 @@ + diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp index bc2e2a2b9b..f262898474 100644 --- a/pcsx2/R5900.cpp +++ b/pcsx2/R5900.cpp @@ -13,7 +13,7 @@ * If not, see . */ - + #include "PrecompiledHeader.h" #include "Common.h" diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index 983f2e47a6..c953e93fc6 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -85,7 +85,7 @@ wxString MemoryCardListView_Simple::OnGetItemText(long item, long column) const { case McdColS_PortSlot: return wxsFormat( L"%u/%u", m_CardProvider->GetPort(item)+1, m_CardProvider->GetSlot(item)+1); case McdColS_Status: return it.IsPresent ? ( it.IsEnabled ? _("Enabled") : _("Disabled")) : _("Missing"); - case McdColS_Size: return it.IsPresent ? wxsFormat( L"%u MB", it.SizeInMB ) : _("N/A"); + case McdColS_Size: return it.IsPresent ? wxsFormat( L"%u MB", it.SizeInMB ) : wxT("N/A"); case McdColS_Formatted: return it.IsFormatted ? _("Yes") : _("No"); case McdColS_DateModified: return it.DateModified.FormatDate(); case McdColS_DateCreated: return it.DateCreated.FormatDate();