Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix for wxOSX build with 10.6 SDK after last commit

Browse Source 
OpenGL core profile constants only exist in 10.7 SDK, don't use them when
compiling with 10.6 one.

See #16402.
This commit is contained in:
Vadim Zeitlin
2015-09-23 03:37:36 +02:00
parent f0e67ed517
commit d68d0dd72f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/cocoa/glcanvas.mm
View File

@@ -234,12 +234,16 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
break; break;
case WX_GL_CORE_PROFILE: case WX_GL_CORE_PROFILE:
// NSOpenGLPFAOpenGLProfile and NSOpenGLProfileVersion3_2Core
// are only defined in 10.7 SDK, we can't support this
// attribute with 10.6.
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
data[p++] = NSOpenGLPFAOpenGLProfile; data[p++] = NSOpenGLPFAOpenGLProfile;
// request an OpenGL core profile // request an OpenGL core profile
// will use the highest available OpenGL version // will use the highest available OpenGL version
// which will be at least 3.2 // which will be at least 3.2
data[p++] = NSOpenGLProfileVersion3_2Core; data[p++] = NSOpenGLProfileVersion3_2Core;
#endif // 10.7+
break; break;
} }
} }