diff options
| author | death2droid <death2droid@gmail.com> | 2009-11-14 13:00:29 +0000 |
|---|---|---|
| committer | death2droid <death2droid@gmail.com> | 2009-11-14 13:00:29 +0000 |
| commit | ee57003ea9bb467f012f31a0673d8fc216521bec (patch) | |
| tree | 97ba1bdd76b27b020dbbbdea9a1bbf6a801e1e8f /Source | |
| parent | 2eff42f659e30ef556d340894d49ab84bab40934 (diff) | |
Dolphin System information window: Added basic and untested linux os information check. And also moved the windows.h include down into the ifdef
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4563 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Summarize.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Source/Core/DolphinWX/Src/Summarize.h b/Source/Core/DolphinWX/Src/Summarize.h index 685e59a489..12b789fd50 100644 --- a/Source/Core/DolphinWX/Src/Summarize.h +++ b/Source/Core/DolphinWX/Src/Summarize.h @@ -19,7 +19,6 @@ #define __SUMMARIZE_H__ #include <windows.h> -#include <dos.h> std::string Summarize_Plug() { @@ -131,8 +130,11 @@ std::string Summarize_Drives() std::string Summarize_OS(void) { - std::string operatingSystem = "Operating System: "; + std::string operatingSystem; + #ifdef _WIN32 + #include <windows.h> + OSVERSIONINFO osver; osver.dwOSVersionInfoSize = sizeof(osver); @@ -145,15 +147,15 @@ std::string Summarize_OS(void) { case 1: if(osver.dwPlatformId == VER_NT_WORKSTATION) - operatingSystem += "Windows 7"; + operatingSystem = "Windows 7"; else operatingSystem += "Windows Server 2008 R2"; break; case 0: if(osver.dwPlatformId == VER_NT_WORKSTATION) - operatingSystem += "Windows Vista"; + operatingSystem = "Windows Vista"; else - operatingSystem += "Windows Server 2008"; + operatingSystem = "Windows Server 2008"; break; } break; @@ -162,25 +164,27 @@ std::string Summarize_OS(void) { case 2: if(GetSystemMetrics(SM_SERVERR2) != 0) - operatingSystem += "Windows Server 2003 R2"; + operatingSystem = "Windows Server 2003 R2"; else - operatingSystem += "Windows Server 2003"; + operatingSystem = "Windows Server 2003"; break; case 1: - operatingSystem += "Windows XP"; + operatingSystem = "Windows XP"; break; case 0: - operatingSystem += "Windows 2000"; + operatingSystem = "Windows 2000"; break; } break; } } #else - operatingSystem = std::string("Non Windows operating system"); +#ifdef __linux__ + #include "linux/version.h" + operatingSystem = UTS_RELEASE; #endif - - return operatingSystem; +#endif + return StringFromFormat("Operating System: %s",operatingSystem); } |