mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-09 11:05:56 +00:00
Linux: Now video is actually outputted. Changing padsimple in to SDL
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@54 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
ec3067e0e1
commit
a626888508
7 changed files with 88 additions and 59 deletions
|
@ -1,12 +1,16 @@
|
|||
Import('env')
|
||||
|
||||
files = ["LogWindow.cpp",
|
||||
"BreakPointDlg.cpp",
|
||||
"BreakpointView.cpp",
|
||||
"CodeView.cpp",
|
||||
"BreakpointWindow.cpp",
|
||||
"CodeWindow.cpp",
|
||||
"CodeView.cpp",
|
||||
"Debugger.cpp",
|
||||
"MemoryCheckDlg.cpp",
|
||||
"MemoryView.cpp",
|
||||
"MemoryWindow.cpp",
|
||||
"RegisterWindow.cpp",
|
||||
"RegisterView.cpp",
|
||||
]
|
||||
|
|
|
@ -151,7 +151,7 @@ wxString NiceSizeFormat(s64 _size)
|
|||
const char* sizes[] = {"b", "KB", "MB", "GB", "TB", "PB", "EB"};
|
||||
int s = 0;
|
||||
int frac = 0;
|
||||
|
||||
|
||||
while (_size > (s64)1024)
|
||||
{
|
||||
s++;
|
||||
|
@ -162,9 +162,9 @@ wxString NiceSizeFormat(s64 _size)
|
|||
float f = (float)_size + ((float)frac / 1024.0f);
|
||||
|
||||
wxString NiceString;
|
||||
wxString tempstring;
|
||||
tempstring = wxString::FromAscii("%3.1f %s"); // Gotta convert to wxString first or else it complains
|
||||
NiceString.Printf(tempstring, f, sizes[s]);
|
||||
char tempstr[32];
|
||||
sprintf(tempstr,"%3.1f %s", f, sizes[s]);
|
||||
NiceString = wxString::FromAscii(tempstr);
|
||||
return(NiceString);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue