revert to r4531, but keep the changes from the following revisions: 4533,4550-4551,4556-4559

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4566 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-11-14 17:08:32 +00:00
parent 18305c7c49
commit 06aa62504c
66 changed files with 2170 additions and 1570 deletions

View File

@ -201,23 +201,3 @@ std::string CPUInfo::Summarize()
if (bLongMode) sum += ", 64-bit support";
return sum;
}
// Turn the cpu info into a string we can show(This version uses headings and line breaks)
std::string CPUInfo::Summarize_long()
{
std::string sum;
sum = StringFromFormat("CPU Brand: %s\n",cpu_string);
sum += StringFromFormat("Number of cores: %i \n ",num_cores);
sum+= "Supported instruction sets:\n";
if (bSSE) sum += " -SSE\n";
if (bSSE2) sum += " -SSE2\n";
if (bSSE3) sum += " -SSE3\n";
if (bSSSE3) sum += " -SSSE3\n";
if (bSSE4_1) sum += " -SSE4.1\n";
if (bSSE4_2) sum += " -SSE4.2\n";
if (bLongMode) sum += "64-bit supported";
return sum;
}

View File

@ -58,9 +58,6 @@ struct CPUInfo
// Turn the cpu info into a string we can show
std::string Summarize();
// Turn the cpu info into a string we can show(This version uses headings and line breaks)
std::string Summarize_long();
};
extern CPUInfo cpu_info;

View File

@ -251,14 +251,6 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool
#endif
}
void ConsoleListener::CustomLog(const char *Text)
{
#ifdef _WIN32
DWORD cCharsWritten;
WriteConsole(hConsole, Text, (DWORD)strlen(Text), &cCharsWritten, NULL);
#endif
}
void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text)
{
#if defined(_WIN32)

View File

@ -83,7 +83,6 @@ public:
#ifdef _WIN32
COORD GetCoordinates(int BytesRead, int BufferWidth);
#endif
void CustomLog(const char *Text);
void Log(LogTypes::LOG_LEVELS, const char *Text);
void ClearScreen(bool Cursor = true);