From 99d37df6cf410117cb8d49774ef7550bcf847c7b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 9 Mar 2015 08:57:24 +0100 Subject: 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. --- make/config/jogl/gl-common.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'make/config/jogl/gl-common.cfg') diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index b881ce4d0..1711d962e 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -17,17 +17,17 @@ RelaxedEqualSemanticsTest true # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ API documentation only! -GLDocHeader GL/glext-supplement.h GLDocHeader GL/gl.h +GLDocHeader GL/glext-supplement.h GLDocHeader GL/glext-20130207.h GLDocHeader GL/glext.h GLDocHeader GL/glcorearb.h GLDocHeader GL/glcorearbext.h -GLDocHeader GLES/glext-supplement.h GLDocHeader GLES/gl.h +GLDocHeader GLES/glext-supplement.h GLDocHeader GLES/glext.h -GLDocHeader GLES2/gl2ext-supplement.h GLDocHeader GLES2/gl2.h +GLDocHeader GLES2/gl2ext-supplement.h GLDocHeader GLES2/gl2ext.h GLDocHeader GLES3/gl31.h GLDocHeader GLES3/gl3ext.h -- cgit v1.2.3