diff options
| author | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
| commit | 0d59bd4c655ef9a27f127000848aae7f07f240ae (patch) | |
| tree | 3ac18e10e105ad70227bbb2205294ac3e6462c0e /make/stub_includes/x11 | |
| parent | 0674a3678d747335ad36f0f57e3bdc9c168f0dcf (diff) | |
Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5
Diffstat (limited to 'make/stub_includes/x11')
| -rw-r--r-- | make/stub_includes/x11/glxext.c | 15 | ||||
| -rw-r--r-- | make/stub_includes/x11/window-system1.c | 19 |
2 files changed, 20 insertions, 14 deletions
diff --git a/make/stub_includes/x11/glxext.c b/make/stub_includes/x11/glxext.c index 67906a088..e781b6e88 100644 --- a/make/stub_includes/x11/glxext.c +++ b/make/stub_includes/x11/glxext.c @@ -1,14 +1,17 @@ -#define GLAPI +// Routines needed from Xlib.h and Xutil.h (placed here to avoid having +// XVisualInfo generated multiple times) +#ifndef _Xconst +#define _Xconst const +#endif /* _Xconst */ -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. +// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in +// "glx.h" are parsed. #define GL_GLEXT_PROTOTYPES -#include <GL/gl.h> - // Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in // "glxext.h" are parsed. #define GLX_GLXEXT_PROTOTYPES #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <GL/glxext.h> +#include <GL/glx.h> +// GL/glxext.h included by GL/glx.h diff --git a/make/stub_includes/x11/window-system1.c b/make/stub_includes/x11/window-system1.c index a06f39dae..e781b6e88 100644 --- a/make/stub_includes/x11/window-system1.c +++ b/make/stub_includes/x11/window-system1.c @@ -1,14 +1,17 @@ -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. -#define GL_GLEXT_PROTOTYPES - -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <GL/glx.h> - // Routines needed from Xlib.h and Xutil.h (placed here to avoid having // XVisualInfo generated multiple times) #ifndef _Xconst #define _Xconst const #endif /* _Xconst */ +// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in +// "glx.h" are parsed. +#define GL_GLEXT_PROTOTYPES + +// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in +// "glxext.h" are parsed. +#define GLX_GLXEXT_PROTOTYPES +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <GL/glx.h> +// GL/glxext.h included by GL/glx.h |