diff options
| author | Sven Gothel <[email protected]> | 2009-07-31 20:13:46 -0700 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-07-31 20:13:46 -0700 |
| commit | 1394a508ab1191e4c200e68342a1b612ba7ff4cc (patch) | |
| tree | df9c6669fedb36b7cbc067ae43de2a48d1dfbbfa /make/config/jogl | |
| parent | 786b056afb90311a8c06a57fc24f242f8df713e1 (diff) | |
JOGL:
- GL2ES12:
- Fix calling convention, broke on Windows.
- Remove GL_APIENTRY on gl2/gl3 header: This was a bug.
- Using proper GL2's APIENTRY
- jogl.all.jar: Add missing shader code ..
Diffstat (limited to 'make/config/jogl')
| -rw-r--r-- | make/config/jogl/gl-gl2es12.cfg | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl-headers.cfg | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl3-headers.cfg | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index c233ef4fd..27fa138d4 100644 --- a/make/config/jogl/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -32,6 +32,10 @@ ForceProcAddressGen glMapBuffer # depend on the presence of an import library for a particular device ForceProcAddressGen __ALL__ +# Also force the calling conventions of the locally generated function +# pointer typedefs for these routines to APIENTRY +LocalProcAddressCallingConvention __ALL__ APIENTRY + EmitProcAddressTable true ProcAddressTableClassName GL2ES12ProcAddressTable GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable()) diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index 1cc5bf05b..5a648b582 100755 --- a/make/config/jogl/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg @@ -35,7 +35,3 @@ CustomCCode #include <GL/gl.h> CustomCCode #include <GL/glx.h> CustomCCode #include <GL/glxext.h> CustomCCode #endif -CustomCCode /* Provide GLES #define for locally generated function pointer typedefs */ -CustomCCode #ifndef GL_APIENTRY -CustomCCode #define GL_APIENTRY GLAPIENTRY -CustomCCode #endif diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg index 282a91ec5..8af9157cf 100755 --- a/make/config/jogl/gl3-headers.cfg +++ b/make/config/jogl/gl3-headers.cfg @@ -23,7 +23,3 @@ CustomCCode #include <stdlib.h> CustomCCode #include <X11/Xlib.h> CustomCCode #include <GL3/gl3.h> CustomCCode #endif -CustomCCode /* Provide GLES #define for locally generated function pointer typedefs */ -CustomCCode #ifndef GL_APIENTRY -CustomCCode #define GL_APIENTRY GLAPIENTRY -CustomCCode #endif |