Fixed Windows-specific problem with locally generated function pointer

typedefs where the calling convention was not specified. Provided new
LocalProcAddressCallingConvention directive to allow developer to
specify the calling convention on a per-function basis; used this in
gl-es1.cfg and gl-es2.cfg. Changed GLEmitter to force the calling
convention of the locally typedefed function pointers for OpenGL
function name unification to GL_APIENTRY, compatible with OpenGL ES 1
and OpenGL ES 2. Changed generated native glue code to #define
GL_APIENTRY appropriately on the desktop. Refactored custom C code.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1712 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 2 insertions, 16 deletions

diff --git a/make/glxext.cfg b/make/glxext.cfg
index 6dd9e5c19..1c93a063c 100755
--- a/make/glxext.cfg
+++ b/make/glxext.cfg
@@ -20,22 +20,8 @@ Import com.sun.opengl.impl.x11.*
 # Ignore everything that doesn't start with glX or GLX
 IgnoreNot ^(glX|GLX).+
 
-CustomCCode #include <inttypes.h>
-CustomCCode #include <stdlib.h>
-CustomCCode #include <X11/Xlib.h>
-
-CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-CustomCCode    "glext.h" are parsed. */
-CustomCCode #define GL_GLEXT_PROTOTYPES
-
-CustomCCode /* Define GLX_GLXEXT_PROTOTYPES so that the OpenGL extension prototypes in
-CustomCCode    "glxext.h" are parsed. */
-CustomCCode #define GLX_GLXEXT_PROTOTYPES
-
-CustomCCode /* Include the OpenGL headers */
-CustomCCode #include <GL/gl.h>
-CustomCCode #include <GL/glx.h>
-CustomCCode #include <GL/glxext.h>
+Include gl-headers.cfg
+Include intptr.cfg
 
 CustomCCode /* Provide Windows typedefs */
 CustomCCode typedef void* LPVOID;