diff options
| author | Manolo Gouy <Manolo> | 2015-10-21 14:37:27 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-10-21 14:37:27 +0000 |
| commit | 1095d4db412a59dd6930051d4419103bd9113811 (patch) | |
| tree | 0f101dcaeeb1a5e8ddfacd9287d7ba02ef1fc644 /src | |
| parent | 6fc9f11eb2e856d6b91a83346bea26c3b9fdd38e (diff) | |
Mac OS and SDK 10.3: #define's necessary for gl_draw.cxx are better in the library source
than in the public header file FL/gl.h
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10872 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/gl_draw.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index a3a08e54b..6f88d0637 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -36,6 +36,12 @@ #include "Xutf8.h" #endif +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +# include <OpenGL/glext.h> +# define kCGBitmapByteOrder32Host 0 +# define GL_TEXTURE_RECTANGLE_ARB GL_TEXTURE_RECTANGLE_EXT +#endif // __APPLE__ + /** Returns the current font's height */ int gl_height() {return fl_height();} /** Returns the current font's descent */ @@ -329,10 +335,6 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { but not text font, and only ASCII characters can be drawn. */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 -#define kCGBitmapByteOrder32Host 0 -#define GL_TEXTURE_RECTANGLE_ARB GL_TEXTURE_RECTANGLE_EXT -#endif static int gl_scale = 1; // set to 2 for high resolution Fl_Gl_Window static int has_texture_rectangle = 0; // true means GL_EXT_texture_rectangle is available |