diff options
| author | Manolo Gouy <Manolo> | 2015-07-18 07:18:15 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-07-18 07:18:15 +0000 |
| commit | 1cf24ff074201327a9153f83045cf6e9fce5bd70 (patch) | |
| tree | f7fbcad25e58701166edd673162e66f62569fdac | |
| parent | 63433f9be790ce69ad3686d18f1c35326fd0e3f6 (diff) | |
Restore compilability with Mac OS SDK 10.3 and above
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10798 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/gl.h | 3 | ||||
| -rw-r--r-- | src/Fl_Gl_Device_Plugin.cxx | 3 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 |
3 files changed, 8 insertions, 0 deletions
@@ -56,6 +56,9 @@ # ifdef __APPLE__ # include <OpenGL/gl.h> +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +# include <OpenGL/glext.h> +#endif # else # include <GL/gl.h> # endif diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index e9b43d1cf..a63a4dd50 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -90,6 +90,9 @@ static Fl_RGB_Image* capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w } #ifdef __APPLE__ +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +typedef CGImageAlphaInfo CGBitmapInfo; +#endif static void imgProviderReleaseData (void *info, const void *data, size_t size) { delete (Fl_RGB_Image *)info; diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index e5eb1c934..5c322cc92 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2715,7 +2715,9 @@ NSOpenGLPixelFormat* Fl_X::mode_to_NSOpenGLPixelFormat(int m, const int *alistp) attribs[n++] = NSOpenGLPFAStereo; } if (m & FL_MULTISAMPLE) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 attribs[n++] = NSOpenGLPFAMultisample, +#endif attribs[n++] = NSOpenGLPFASampleBuffers; attribs[n++] = (NSOpenGLPixelFormatAttribute)1; attribs[n++] = NSOpenGLPFASamples; attribs[n++] = (NSOpenGLPixelFormatAttribute)4; } |