piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Now video is actually outputted. Changing padsimple in to SDL

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@54 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-07-22 11:16:45 +00:00
parent ec3067e0e1
commit a626888508
7 changed files with 88 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DebuggerWX/src/SConscript
View File

@ -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",
]

8
Source/Core/DolphinWX/src/GameListCtrl.cpp
View File

@ -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);
}