Commit c10afa4816fb7b3f6712badc4ccef871525939ea
2014-04-29T19:22:48
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.
diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
index 348c72c..1e5d0ff 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__ */