From c10afa4816fb7b3f6712badc4ccef871525939ea Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Tue, 29 Apr 2014 19:22:48 -0400 Subject: [PATCH] Fixed a linker error when building SDL/WinRT The Win32 APIs, VerifyVersionInfoW and VerSetConditionMask, are not currently available for use in WinRT apps. This change primarily #if[n]defs-out some calls to them. --- src/core/windows/SDL_windows.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c index 348c72c8328ce..1e5d0ff4932eb 100644 --- a/src/core/windows/SDL_windows.c +++ b/src/core/windows/SDL_windows.c @@ -93,6 +93,7 @@ WIN_CoUninitialize(void) #endif } +#ifndef __WINRT__ static BOOL IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor) { @@ -112,10 +113,15 @@ IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServiceP return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; } +#endif BOOL WIN_IsWindowsVistaOrGreater() { +#ifdef __WINRT__ + return TRUE; +#else return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0); +#endif } #endif /* __WIN32__ */