Merged bugfix from 2.7.3-pre.

This commit is contained in:
Camilla Berglund 2011-08-14 01:28:54 +02:00
parent 113bc94042
commit c32fa805d5

View File

@ -477,8 +477,9 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window,
const _GLFWfbconfig *fbconfig) const _GLFWfbconfig *fbconfig)
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
// Fail if OpenGL 3.3 or above was requested // Fail if any OpenGL version above 2.1 other than 3.2 was requested
if (wndconfig->glMajor > 3 || wndconfig->glMajor == 3 && wndconfig->glMinor > 2) if (wndconfig->glMajor > 3 ||
(wndconfig->glMajor == 3 && wndconfig->glMinor != 2))
{ {
_glfwSetError(GLFW_VERSION_UNAVAILABLE, _glfwSetError(GLFW_VERSION_UNAVAILABLE,
"Cocoa/NSOpenGL: The targeted version of Mac OS X does " "Cocoa/NSOpenGL: The targeted version of Mac OS X does "