From 7e2ff95a979e68bef42b7dfc7b98eb0cfa3e07d1 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Fri, 27 Nov 2009 00:06:56 +0000 Subject: [PATCH] Remove Windows Vista/7 SDK requirement for compiling. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2257 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/Linux/LnxMisc.cpp | 2 +- common/src/Utilities/Windows/WinMisc.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/Utilities/Linux/LnxMisc.cpp b/common/src/Utilities/Linux/LnxMisc.cpp index f09c5fe8a2..8078d43b85 100644 --- a/common/src/Utilities/Linux/LnxMisc.cpp +++ b/common/src/Utilities/Linux/LnxMisc.cpp @@ -48,6 +48,6 @@ wxString GetOSVersionString() // This shoul return a single comprehensive string description for the linux operating system: // Kernel version, distribution, etc. - return L"Linux Maybe?"; + return wxGetOsDescription(); } diff --git a/common/src/Utilities/Windows/WinMisc.cpp b/common/src/Utilities/Windows/WinMisc.cpp index e064ca355f..795b0cad7a 100644 --- a/common/src/Utilities/Windows/WinMisc.cpp +++ b/common/src/Utilities/Windows/WinMisc.cpp @@ -39,6 +39,11 @@ u64 GetCPUTicks() return count.QuadPart; } +// Windows SDK 7 provides this but previous ones do not, so roll our own in those cases: +#ifndef VER_SUITE_WH_SERVER +# define VER_SUITE_WH_SERVER 0x00008000 +#endif + typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);