diff options
| author | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
|---|---|---|
| committer | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
| commit | 9fce91044649c9f97bd94c5791a10270afad7570 (patch) | |
| tree | a69fa244ddeb78e52248d4306a4ecc6b27e924da /make/config/jogl/gl3-headers.cfg | |
| parent | 5116d72f0150bdd6353ee664ef76e414bd61f87e (diff) | |
| parent | bfb10d309d97c19a33f9b6758f647186f8e0ddd6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'make/config/jogl/gl3-headers.cfg')
| -rw-r--r-- | make/config/jogl/gl3-headers.cfg | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg index 8b35a07b4..7ab5099c9 100644 --- a/make/config/jogl/gl3-headers.cfg +++ b/make/config/jogl/gl3-headers.cfg @@ -1,7 +1,6 @@ CustomCCode #include <stdio.h> /* android */ -CustomCCode /* Define GL3_PROTOTYPES so that the OpenGL extension prototypes in -CustomCCode "gl3.h" are parsed. */ -CustomCCode #define GL3_PROTOTYPES +CustomCCode /** Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed. */ +CustomCCode #define GL_GLEXT_PROTOTYPES CustomCCode #if defined(_WIN32) CustomCCode #define WIN32_LEAN_AND_MEAN CustomCCode #include <windows.h> @@ -9,11 +8,13 @@ CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode #include <stdlib.h> CustomCCode #include <stddef.h> CustomCCode #include <malloc.h> -CustomCCode #include <GL3/gl3.h> +CustomCCode #include <GL/glcorearb.h> +CustomCCode #include <GL/glcorearbext.h> CustomCCode #elif defined(macosx) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> -CustomCCode #include <GL3/gl3.h> +CustomCCode #include <GL/glcorearb.h> +CustomCCode #include <GL/glcorearbext.h> CustomCCode #include </usr/include/machine/types.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; @@ -22,5 +23,6 @@ CustomCCode #elif defined(__unix__) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> CustomCCode #include <X11/Xlib.h> -CustomCCode #include <GL3/gl3.h> +CustomCCode #include <GL/glcorearb.h> +CustomCCode #include <GL/glcorearbext.h> CustomCCode #endif |