diff options
| author | Sven Gothel <[email protected]> | 2015-03-09 08:57:24 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-09 08:57:24 +0100 |
| commit | 99d37df6cf410117cb8d49774ef7550bcf847c7b (patch) | |
| tree | e0a8b810dfee33f0ff570bc9e9e3e80115935c96 /make/config/jogl/wglext.cfg | |
| parent | e3385993b4133f88fd1b8e335438f5f2cd305555 (diff) | |
Bug 1135 - (Re-)Include GL header for in generated native code, allowing 'ProcAddrTypedef' validation
Include GL header for in generated native code,
since we need the public 'ProcAddrTypedef' to be validated
against the GlueGen generated variant by the c-compiler.
The 'ProcAddrTypedef' validation semantic has been
introduced in GlueGen w/ commit 10060b091b76bee35246c5165d49ab546ebc4e37.
Originally the GL header were always included,
however, JOGL commit 0d59bd4c655ef9a27f127000848aae7f07f240ae
removed the inclusion to simplify handling GL extension collisions
mitigated via gl*-supplement.h. The latter produces 'redefine'
errors via c-compiler.
The 'redefine' issue above is resolved
by conditional code (#ifdef __GLUEGEN__ ..)
in glext-supplement.h.
Diffstat (limited to 'make/config/jogl/wglext.cfg')
| -rw-r--r-- | make/config/jogl/wglext.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index 6b5815fdf..4c0061372 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -18,6 +18,7 @@ NIOOnly __ALL__ NIODirectOnly __ALL__ GLSemHeader wingdi.h +GLSemHeader gl-types.h GLSemHeader GL/wglext.h EmitProcAddressTable true @@ -35,7 +36,6 @@ Include glx-headers.cfg # JSR-239 NIO subset (remove once we have Java SE classes running on CVM) # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined -GLSemHeader GL/wglext.h IgnoreExtension WGL_OML_sync_control IgnoreExtension WGL_NV_gpu_affinity |