mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Manolo Gouy 2015-10-21 14:37:27 +00:00
parent 6fc9f11eb2
commit 1095d4db41
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FL/gl.h
View File

@ -56,12 +56,6 @@
# ifdef __APPLE__
# include <OpenGL/gl.h>
# ifdef FL_LIBRARY
# include <FL/x.H>
# if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
# include <OpenGL/glext.h>
# endif
# endif // FL_LIBRARY
# else
# include <GL/gl.h>
# endif // __APPLE__

10
src/gl_draw.cxx
View File

@ -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