Utilize GlueGen's platform independent header for stdin.h, gluegen_stdint.h, .. (remove local copy)

- Use them for gluegen code generation
- Use them for native compilation (cc)

10 files changed, 41 insertions, 172 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index aac3849e0..454e5d1aa 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -58,7 +58,9 @@
         <property name="make"                       value="." />
         <property name="config"                     value="${make}/config" />
         <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-        <property name="stub.includes.common"       value="${stub.includes}/gluegen" />
+
+        <property name="stub.includes.gluegen.gg"  value="${gluegen.root}/make/stub_includes/gluegen" />
+        <property name="stub.includes.gluegen.cc"  value="${gluegen.root}/make/stub_includes/platform" />
 
         <tstamp>
              <format property="version.timestamp" pattern="yyyyMMdd"/>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index d11d70c21..64609fb13 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -228,10 +228,10 @@
             <include name="${stub.includes}/macosx/**" />
             <include name="${stub.includes}/win32/**" />
             <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/gluegen/**" />
             <include name="${stub.includes}/khr/**" />
             <include name="${stub.includes}/jni/**" />
         </dirset>
+
         <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
             <include name="opengl/**" />
             <include name="macosx/**" />
@@ -253,8 +253,8 @@
             <include name="${stub.includes}/macosx/**" />
             <include name="${stub.includes}/win32/**" />
             <include name="${stub.includes}/x11/**" />
-            <include name="${stub.includes}/gluegen/**" />
             <include name="${stub.includes}/khr/**" />
+            <include name="${stub.includes}/jni/**" />
         </dirset>
         <fileset id="stub.includes.cg.dependencies.fileset" dir=".">
             <include name="${stub.includes}/cg/**" />
@@ -397,7 +397,8 @@
         <gluegen src="${stub.includes.opengl}/gles2.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl.cfg"
-                 includeRefid="stub.includes.fileset.all.gldesktop"
+                 includeRefid="stub.includes.fileset.all.gldesktop" 
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -411,6 +412,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es1.cfg" 
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -423,6 +425,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es2.cfg" 
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -435,6 +438,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3-subset.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -443,6 +447,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -455,6 +460,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -467,6 +473,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -479,6 +486,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3bc.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -491,6 +499,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl4.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -503,6 +512,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4bc.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -516,6 +526,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es1.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -529,6 +540,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -541,6 +553,7 @@
         <gluegen src="${gl.c}" 
                  config="${gl.cfg.nsig}"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.nativesig.NativeSignatureEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -553,6 +566,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-base.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -565,6 +579,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2es1.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -577,6 +592,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -589,6 +605,7 @@
                  outputRootDir="${build.jogl}"
                  config="${glext.platform.cfg}"
                  includeRefid="stub.includes.fileset.all.gldesktop"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -602,6 +619,7 @@
                  outputRootDir="${build.jogl}"
                  config="${window.es.cfg}"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -616,6 +634,7 @@
                  outputRootDir="${build.jogl}"
                  config="${window.es.ext.cfg}"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
             <classpath refid="gluegen-gl.classpath" />
@@ -629,6 +648,7 @@
                  outputRootDir="${build.jogl}"
                  config="${window.os0.cfg}"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -641,6 +661,7 @@
                  outputRootDir="${build.jogl}"
                  config="${window.os1.cfg}"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -772,6 +793,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/cg-common.cfg"
                  includeRefid="stub.includes.cg.fileset.all"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
             <classpath refid="gluegen-gl.classpath" />
         </gluegen>
@@ -1290,6 +1312,7 @@
               <compiler extends="@{compiler.cfg.id}" >
                 <sysincludepath path="${java.includes.dir}"/>
                 <sysincludepath path="${java.includes.dir.platform}"/>
+                <sysincludepath path="${stub.includes.gluegen.cc}"/>
                 <includepath path="stub_includes/khr"/>
                 <includepath path="stub_includes/egl"/>
                 <includepath path="stub_includes/opengl"/>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 475904b06..da32f1809 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -232,6 +232,7 @@
                  outputRootDir="${build.nativewindow}"
                  config="${windowlib.os.cfg}"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}"
                  emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -246,8 +247,8 @@
         <gluegen src="${jawt.platform.header}"
                  outputRootDir="${build.nativewindow}"
                  config="${jawt.cfg}"
-                 literalInclude="${stub.includes}/jni"
                  includeRefid="stub.includes.fileset.platform"
+                 literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/jni"
                  emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -578,6 +579,7 @@
               <compiler extends="@{compiler.cfg.id}" >
                 <sysincludepath path="${java.includes.dir}"/>
                 <sysincludepath path="${java.includes.dir.platform}"/>
+                <sysincludepath path="${stub.includes.gluegen.cc}"/>
                 <!-- This is for the generated headers for handwritten C code -->
                 <includepath path="${src.generated.c}" />
                 <includepath path="${src.generated.c}/X11" if="isX11"/>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index d062f9276..178824f01 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -468,6 +468,7 @@
               <compiler extends="@{compiler.cfg.id}" >
                 <sysincludepath path="${java.includes.dir}"/>
                 <sysincludepath path="${java.includes.dir.platform}"/>
+                <sysincludepath path="${stub.includes.gluegen.cc}"/>
                 <includepath path="stub_includes/khr"/>
                 <includepath path="stub_includes/egl"/>
                 <!-- This is for finding Xrandr.h on Solaris. -->
diff --git a/make/stub_includes/gluegen/gluegen_types.h b/make/stub_includes/gluegen/gluegen_types.h
deleted file mode 100644
index c854d3345..000000000
--- a/make/stub_includes/gluegen/gluegen_types.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __gluegen_types_h
-#define __gluegen_types_h
-
-/**
- * These are standard include replacement files
- * for gluegen processing only!
- *
- * Don't include this folder to your native compiler!
- *
- * Purpose of all files within this folder is to define a fixed bitsize
- * across all platforms to allow the resulting java type comfort all.
- * IE a 'intptr_t' shall always be 64bit.
- *
- * We use one size fits all.
- */
-#if defined(__STDC_VERSION__) || defined(__GNUC__) || defined (__ARMCC_2__) || \
-    defined(__VMS) || defined(__sgi) || defined(__sun__) || defined(__digital__) || defined(__unix__) || defined(__SCO__) || defined(OPENSTEP) || \
-    defined(BSD) || defined(FREEBSD) || defined(_HPUX) || defined(SOLARIS) || defined(macosx) || \
-    defined(_WIN32) || defined(_WIN32_WCE) || defined(WINVER) || defined(_WIN32_WINNT) || defined(__CYGWIN__) || \
-    defined(__SCITECH_SNAP__) || defined (__SYMBIAN32__) || \
-    defined(__arch64__) || defined(_LP64)
-
-    #error PLATFORM or COMPILER DEFINES FOUND, not allowed within GLUEGEN HEADER
-
-#endif
-
-/**
- * Look in the GlueGen.java API documentation for the build-in types (terminal symbols) 
- * definition.
- * 
- * The following types are build-in:
- *
- * __int32
- * int32_t
- * uint32_t
- * __int64
- * int64_t
- * uint64_t
- * ptrdiff_t
- * size_t
- */
-
-#endif /* __gluegen_types_h */
-
diff --git a/make/stub_includes/gluegen/inttypes.h b/make/stub_includes/gluegen/inttypes.h
deleted file mode 100644
index b4ac3d40f..000000000
--- a/make/stub_includes/gluegen/inttypes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __inttypes_h
-#define __inttypes_h
-
-#include <gluegen_types.h>
-
-#endif /* __stdint_h */
-
diff --git a/make/stub_includes/gluegen/stdarg.h b/make/stub_includes/gluegen/stdarg.h
deleted file mode 100644
index b5b585baa..000000000
--- a/make/stub_includes/gluegen/stdarg.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __stdarg_h
-#define __stdarg_h
-
-#include <gluegen_types.h>
-
-#endif /* __stdarg_h */
-
diff --git a/make/stub_includes/gluegen/stddef.h b/make/stub_includes/gluegen/stddef.h
deleted file mode 100644
index a3890b08a..000000000
--- a/make/stub_includes/gluegen/stddef.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __stddef_h
-#define __stddef_h
-
-#include <gluegen_types.h>
-
-#endif /* __stddef_h */
diff --git a/make/stub_includes/gluegen/stdint.h b/make/stub_includes/gluegen/stdint.h
deleted file mode 100644
index dd03d2d1e..000000000
--- a/make/stub_includes/gluegen/stdint.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __stdint_h
-#define __stdint_h
-
-#include <gluegen_types.h>
-
-#endif /* __stdint_h */
-
diff --git a/make/stub_includes/khr/KHR/khrplatform.h b/make/stub_includes/khr/KHR/khrplatform.h
index 1c578feb8..1f10e5c0a 100644
--- a/make/stub_includes/khr/KHR/khrplatform.h
+++ b/make/stub_includes/khr/KHR/khrplatform.h
@@ -132,16 +132,14 @@
 /*-------------------------------------------------------------------------
  * basic type definitions
  *-----------------------------------------------------------------------*/
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
-
 
 /*
- * Using <stddef.h>
- * Using <stdint.h>
+ * Using <gluegen_stddef.h>
+ * Using <gluegen_stdint.h>
  */
-#include <stddef.h>
+#include <gluegen_stddef.h>
 #define HAS_STDDEF 1
-#include <stdint.h>
+#include <gluegen_stdint.h>
 typedef int32_t                 khronos_int32_t;
 typedef uint32_t                khronos_uint32_t;
 typedef int64_t                 khronos_int64_t;
@@ -149,100 +147,14 @@ typedef uint64_t                khronos_uint64_t;
 #define KHRONOS_SUPPORT_INT64   1
 #define KHRONOS_SUPPORT_FLOAT   1
 
-#elif defined(__VMS ) || defined(__sgi)
-
-/*
- * Using <stddef.h>
- * Using <inttypes.h>
- */
-#include <stddef.h>
-#define HAS_STDDEF 1
-#include <inttypes.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
-
-/*
- * Win32
- */
-typedef __int32                 khronos_int32_t;
-typedef unsigned __int32        khronos_uint32_t;
-typedef __int64                 khronos_int64_t;
-typedef unsigned __int64        khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__sun__) || defined(__digital__)
-
-/*
- * Sun or Digital
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#if defined(__arch64__) || defined(_LP64)
-typedef long int                khronos_int64_t;
-typedef unsigned long int       khronos_uint64_t;
-#else
-typedef long long int           khronos_int64_t;
-typedef unsigned long long int  khronos_uint64_t;
-#endif /* __arch64__ */
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif 0
-
-/*
- * Hypothetical platform with no float or int64 support
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#define KHRONOS_SUPPORT_INT64   0
-#define KHRONOS_SUPPORT_FLOAT   0
-
-#else
-
-/*
- * Generic fallback
- *
- * Using <stddef.h>
- * Using <stdint.h>
- */
-#include <stddef.h>
-#define HAS_STDDEF 1
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#endif
-
-
-/*
- * Types that are (so far) the same on all platforms
- */
 typedef signed   char          khronos_int8_t;
 typedef unsigned char          khronos_uint8_t;
 typedef signed   short int     khronos_int16_t;
 typedef unsigned short int     khronos_uint16_t;
-#ifndef HAS_STDDEF
-    typedef signed   long  int      khronos_intptr_t;
-    typedef unsigned long  int      khronos_uintptr_t;
-    typedef signed   long  int      khronos_ssize_t;
-    typedef unsigned long  int      khronos_usize_t;
-#else
-    typedef ptrdiff_t               khronos_intptr_t;
-    typedef size_t                  khronos_uintptr_t;
-    typedef ptrdiff_t               khronos_ssize_t;
-    typedef size_t                  khronos_usize_t;
-#endif
+typedef ptrdiff_t              khronos_intptr_t;
+typedef size_t                 khronos_uintptr_t;
+typedef ptrdiff_t              khronos_ssize_t;
+typedef size_t                 khronos_usize_t;
 
 #if KHRONOS_SUPPORT_FLOAT
 /*