Merge branch 'master' of http://github.com/sgothel/jogl

23 files changed, 25 insertions, 41 deletions

diff --git a/make/config/intptr.cfg b/make/config/intptr.cfg
deleted file mode 100644
index c946e4851..000000000
--- a/make/config/intptr.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-CustomCCode #ifdef _WIN32
-CustomCCode  #ifdef _MSC_VER
-CustomCCode  /* This typedef is apparently needed for Microsoft compilers before VC8,
-CustomCCode     and on Windows CE */
-CustomCCode   #if (_MSC_VER < 1400) || defined(UNDER_CE)
-CustomCCode    #ifdef _WIN64
-CustomCCode     typedef long long intptr_t;
-CustomCCode    #else
-CustomCCode     typedef int intptr_t;
-CustomCCode    #endif
-CustomCCode   #endif
-CustomCCode  #else
-CustomCCode   #include <inttypes.h>
-CustomCCode  #endif
-CustomCCode #else
-CustomCCode  #include <inttypes.h>
-CustomCCode #endif
diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg
index 7ec47390f..606f86b9d 100644
--- a/make/config/jogl/cg-common.cfg
+++ b/make/config/jogl/cg-common.cfg
@@ -119,6 +119,7 @@ RuntimeExceptionType CgException
 # generated C code
 #
 
+CustomCCode #include <stdio.h> /* android */
 CustomCCode #include <stdlib.h>
 CustomCCode #include <Cg/cgGL.h>
 CustomCCode
diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg
index 721fe911b..34a59dda3 100644
--- a/make/config/jogl/cglext.cfg
+++ b/make/config/jogl/cglext.cfg
@@ -23,8 +23,9 @@ GetProcAddressTableExpr _context.getCGLExtProcAddressTable()
 # Ignore everything that doesn't start with cgl or CGL
 IgnoreNot ^(cgl|CGL).+
 
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 Include gl-headers.cfg
-Include ../intptr.cfg
 
 CustomJavaCode CGLExt      public boolean isFunctionAvailable(String glFunctionName);
 CustomJavaCode CGLExt      public boolean isExtensionAvailable(String glExtensionName);
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index ea299bfcc..ee74b46e6 100644
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -21,10 +21,11 @@ GetProcAddressTableExpr _table
 ArgumentIsString eglGetProcAddress 0
 ReturnsString eglQueryString
 
+CustomCCode #include <stdio.h> /* android */
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 CustomCCode #include <EGL/egl.h>
 
-Include ../intptr.cfg
-
 CustomJavaCode EGL  private static EGLProcAddressTable _table = new EGLProcAddressTable(new GLProcAddressResolver());
 CustomJavaCode EGL  public static void resetProcAddressTable(DynamicLookupHelper lookup) {
 CustomJavaCode EGL      _table.reset(lookup);
diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg
index 3af90d3af..2e422ff72 100644
--- a/make/config/jogl/eglext.cfg
+++ b/make/config/jogl/eglext.cfg
@@ -20,6 +20,9 @@ EmitProcAddressTable true
 ProcAddressTableClassName EGLExtProcAddressTable
 GetProcAddressTableExpr _context.getEGLExtProcAddressTable()
 
+CustomCCode #include <stdio.h> /* android */
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 CustomCCode /* Define EGL_EGLEXT_PROTOTYPES so that the EGL extension prototypes in
 CustomCCode    "eglext.h" are parsed. */
 CustomCCode #define EGL_EGLEXT_PROTOTYPES
@@ -27,8 +30,6 @@ CustomCCode
 CustomCCode #include <EGL/egl.h>
 CustomCCode #include <EGL/eglext.h>
 
-Include ../intptr.cfg
-
 # There are some #defines in eglext.h that GlueGen and PCPP don't currently handle
 CustomJavaCode EGLExt      /** Part of <code>EGL_KHR_image</code> */
 CustomJavaCode EGLExt      public static final long EGL_NO_IMAGE = 0;
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index 88ce09569..518dc07b5 100644
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -78,6 +78,7 @@ CustomJavaCode GLES1Impl   glClearDepthf((float)depth); }
 CustomJavaCode GLES1Impl  public void glDepthRange(double zNear, double zFar) {
 CustomJavaCode GLES1Impl   glDepthRangef((float)zNear, (float)zFar); }
 
+CustomCCode #include <stdio.h> /* android */
 CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
@@ -87,7 +88,6 @@ CustomCCode /* #define GL_APICALL __declspec(dllimport) */
 CustomCCode #include <GLES/gl.h>
 CustomCCode #include <GLES/glext.h>
 CustomCCode #include <stdlib.h>
-Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java
diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg
index f529ddbf7..614904aa0 100644
--- a/make/config/jogl/gl-es2.cfg
+++ b/make/config/jogl/gl-es2.cfg
@@ -62,6 +62,7 @@ JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offs
 
 IncludeAs CustomJavaCode GLES2 gl-if-CustomJavaCode-gles2.java
 
+CustomCCode #include <stdio.h> /* android */
 CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
@@ -71,7 +72,6 @@ CustomCCode /* #define GL_APICALL __declspec(dllimport) */
 CustomCCode #include <GLES2/gl2.h>
 CustomCCode #include <GLES2/gl2ext.h>
 CustomCCode #include <stdlib.h>
-Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gles2.java
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index 6833d24d5..67582af91 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -89,7 +89,6 @@ CustomJavaCode GL4bcImpl   glOrtho((double)left, (double)right, (double)bottom,
 
 Include gl-headers.cfg
 Include gl3ext-headers.cfg
-Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl4bc.java
diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg
index a23d09dc1..b80630c63 100644
--- a/make/config/jogl/gl-headers.cfg
+++ b/make/config/jogl/gl-headers.cfg
@@ -1,3 +1,5 @@
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <stdio.h> /* android */
 CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg
index 6063bba7e..da6ca1647 100644
--- a/make/config/jogl/gl-if-gl2.cfg
+++ b/make/config/jogl/gl-if-gl2.cfg
@@ -35,7 +35,6 @@ CustomJavaCode GL2     public boolean glIsPBOPackEnabled();
 CustomJavaCode GL2     public boolean glIsPBOUnpackEnabled();
 
 Include gl-headers.cfg
-Include ../intptr.cfg
 
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg
index 3ccc2c58c..fc08eccfd 100644
--- a/make/config/jogl/gl-if-gl3.cfg
+++ b/make/config/jogl/gl-if-gl3.cfg
@@ -31,7 +31,6 @@ EmitProcAddressTable false
 TagNativeBinding true
 
 Include gl3-headers.cfg
-Include ../intptr.cfg
 
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg
index f23d3710d..6765e099f 100644
--- a/make/config/jogl/gl-if-gl3bc.cfg
+++ b/make/config/jogl/gl-if-gl3bc.cfg
@@ -38,7 +38,6 @@ IgnoreExtension GL_EXT_point_parameters
 
 Include gl-headers.cfg
 Include gl3ext-headers.cfg
-Include ../intptr.cfg
 
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg
index b660bfaac..dbcf633b2 100644
--- a/make/config/jogl/gl-if-gl4.cfg
+++ b/make/config/jogl/gl-if-gl4.cfg
@@ -29,5 +29,4 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 TagNativeBinding true
 
 Include gl3-headers.cfg
-Include ../intptr.cfg
 
diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg
index 3cab4a4e9..8b35a07b4 100644
--- a/make/config/jogl/gl3-headers.cfg
+++ b/make/config/jogl/gl3-headers.cfg
@@ -1,3 +1,4 @@
+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
diff --git a/make/config/jogl/gl3ext-headers.cfg b/make/config/jogl/gl3ext-headers.cfg
index dfc4ea796..5e2c7aa37 100644
--- a/make/config/jogl/gl3ext-headers.cfg
+++ b/make/config/jogl/gl3ext-headers.cfg
@@ -1,3 +1,4 @@
+CustomCCode #include <stdio.h> /* android */
 CustomCCode /* Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in
 CustomCCode    "gl3ext.h" are parsed. */
 CustomCCode #define GL_GL3EXT_PROTOTYPES
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 5909c8743..9387b4c4a 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -8,6 +8,7 @@ ImplPackage javax.media.opengl.glu.gl2
 ImplJavaClass GLUgl2
 ParentClass GLUgl2 GLU
 
+CustomCCode #include <stdio.h> /* android */
 CustomCCode #if defined(WIN32)
 CustomCCode   #define WIN32_LEAN_AND_MEAN
 CustomCCode   #include <windows.h>
@@ -22,8 +23,6 @@ CustomCCode #elif defined(__unix__)
 CustomCCode   #include <inttypes.h>
 CustomCCode #endif
 
-Include ../intptr.cfg
-
 EmitProcAddressTable true
 ProcAddressTablePackage   jogamp.opengl.glu.gl2
 ProcAddressTableClassName GLUgl2ProcAddressTable
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index 82490a2e8..de23b9f17 100644
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -26,7 +26,6 @@ Import jogamp.nativewindow.x11.*
 IgnoreNot ^(glX|GLX).+
 
 Include gl-headers.cfg
-Include ../intptr.cfg
 
 CustomCCode /* Provide Windows typedefs */
 CustomCCode typedef void* LPVOID;
diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg
index a86834531..c7adffa7b 100644
--- a/make/config/jogl/wgl-win32.cfg
+++ b/make/config/jogl/wgl-win32.cfg
@@ -34,11 +34,10 @@ CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
 CustomCCode #undef WIN32_LEAN_AND_MEAN
 
+CustomCCode #include <gluegen_stdint.h>
 CustomCCode #include <wingdi.h>
 CustomCCode #include <stddef.h>
 
-Include ../intptr.cfg
-
 DropUniqVendorExtensions AMD
 # We need GL_APPLE_float_pixels for our pbuffer implementation
 # DropUniqVendorExtensions APPLE
diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg
index d37a861b7..15986b6cf 100644
--- a/make/config/jogl/wglext.cfg
+++ b/make/config/jogl/wglext.cfg
@@ -25,7 +25,6 @@ Ignore GL_.+
 Ignore gl.+
 
 Include gl-headers.cfg
-Include ../intptr.cfg
 
 # FIXME: for the time being, ignore all extensions requiring the
 # presence of java.nio.LongBuffer because it doesn't exist on CDC/FP +
diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg
index d1fa7020a..5b571f719 100644
--- a/make/config/nativewindow/jawt-win32.cfg
+++ b/make/config/nativewindow/jawt-win32.cfg
@@ -8,7 +8,8 @@ Opaque long HDC
 IgnoreField JAWT_Win32DrawingSurfaceInfo null
 IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette
 
-Include ../intptr.cfg
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 
 StructPackage JAWT_Win32DrawingSurfaceInfo jogamp.nativewindow.jawt.windows
 EmitStruct JAWT_Win32DrawingSurfaceInfo
diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg
index ac9d1aa9a..05db2aa0c 100644
--- a/make/config/nativewindow/jawt-x11.cfg
+++ b/make/config/nativewindow/jawt-x11.cfg
@@ -8,7 +8,8 @@ Opaque long Display *
 
 IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor
 
-CustomCCode #include <inttypes.h>
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 
 StructPackage JAWT_X11DrawingSurfaceInfo jogamp.nativewindow.jawt.x11
 EmitStruct JAWT_X11DrawingSurfaceInfo
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index 894211182..b8886bdac 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -29,10 +29,9 @@ CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
 CustomCCode #undef WIN32_LEAN_AND_MEAN
 
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 CustomCCode #include <wingdi.h>
-CustomCCode #include <stddef.h>
-
-Include ../intptr.cfg
 
 CustomCCode extern HINSTANCE   GetApplicationHandle();
 
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 8848980ea..d9e4ccd0a 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -39,7 +39,8 @@ CustomJavaCode X11Lib private static int getFirstElement(int[] arr, int offset)
 
 CustomJavaCode XVisualInfo public static XVisualInfo create(XVisualInfo s) { XVisualInfo d = XVisualInfo.create(); d.getBuffer().put(s.getBuffer()); d.getBuffer().rewind(); s.getBuffer().rewind(); return d; }
 
-CustomCCode #include <inttypes.h>
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 CustomCCode #include <X11/Xlib.h>
 CustomCCode #include <X11/Xutil.h>