New Int64Buffer type, which is being used for gluegen 'long *'

5 files changed, 94 insertions, 1 deletions

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 86292a2..518d58a 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -23,6 +23,8 @@
         <!-- Call the external config validator script to make sure the config is ok and consistent -->
         <ant antfile="validate-properties.xml" inheritall="true"/>
 
+        <property name="make" value="." />
+
         <property name="test.base.dir"  value="${gluegen.root}/src/junit" />
         <property name="test.junit.rel" value="com/jogamp/gluegen/test/junit" />
         <property name="test.junit.dir" value="${test.base.dir}/${test.junit.rel}" />
@@ -74,6 +76,8 @@
             <pathelement location="${gluegen-test.jar}" />
         </path>
 
+        <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
+
         <echo message="test.base.dir: ${test.base.dir} "/>
         <echo message="test.junit.dir: ${test.junit.dir} "/>
         <echo message="test.dir: ${test.dir} "/>
@@ -159,6 +163,7 @@
           <compiler extends="@{compiler.cfg.id}" >
             <sysincludepath path="${java.includes.dir}"/>
             <sysincludepath path="${java.includes.dir.platform}"/>
+            <includepath path="${stub.includes.dir}/common"/>
             <includepath path="${test.junit.dir}"/>
             <includepath path="${build_t.gen}/native"/>
           </compiler>
@@ -229,7 +234,10 @@
     <target name="junit.test1.java.generate">
         <echo message=" - - - junit.test1.java.generate" />
 
-        <dirset id="stub.includes.fileset.test" dir="." includes="${test.junit.dir}/*" />
+        <dirset id="stub.includes.fileset.test" dir=".">
+            <include name="${test.junit.dir}/**"/>
+            <include name="${stub.includes.dir}/**" />
+        </dirset>
 
         <gluegen src="${test.junit.dir}/test1-gluegen.c"
                  outputRootDir="${build_t.gen}"
diff --git a/make/stub_includes/common/gluegenint.h b/make/stub_includes/common/gluegenint.h
new file mode 100644
index 0000000..5fb4002
--- /dev/null
+++ b/make/stub_includes/common/gluegenint.h
@@ -0,0 +1,42 @@
+#ifndef __gluegen_int_h_
+#define __gluegen_int_h_
+
+#ifndef GLUEGEN_INT_TYPES_DEFINED
+    #define GLUEGEN_INT_TYPES_DEFINED
+    /* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+    /* (as used in the GL_EXT_timer_query extension). */
+    #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+        #include <inttypes.h>
+    #elif defined(__sun__)
+        #include <inttypes.h>
+        #if defined(__STDC__)
+            #if defined(__arch64__)
+                typedef long int int64_t;
+                typedef unsigned long int uint64_t;
+            #else
+                typedef long long int int64_t;
+                typedef unsigned long long int uint64_t;
+            #endif /* __arch64__ */
+        #endif /* __STDC__ */
+    #elif defined( __VMS )
+        #include <inttypes.h>
+    #elif defined(__SCO__) || defined(__USLC__)
+        #include <stdint.h>
+    #elif defined(__UNIXOS2__) || defined(__SOL64__)
+        typedef long int int32_t;
+        typedef unsigned long int uint32_t;
+        typedef long long int int64_t;
+        typedef unsigned long long int uint64_t;
+    #elif defined(WIN32) && defined(__GNUC__)
+        #include <stdint.h>
+    #elif defined(_WIN32)
+        typedef __int32 int32_t;
+        typedef unsigned __int32 uint32_t;
+        typedef __int64 int64_t;
+        typedef unsigned __int64 uint64_t;
+    #else
+        #include <inttypes.h>     /* Fallback option */
+    #endif
+#endif
+
+#endif /* __gluegen_int_h_ */
diff --git a/make/stub_includes/replacement/inttypes.h b/make/stub_includes/replacement/inttypes.h
new file mode 100644
index 0000000..cb4f143
--- /dev/null
+++ b/make/stub_includes/replacement/inttypes.h
@@ -0,0 +1,18 @@
+#if defined(WIN32) && defined(__GNUC__)
+    #include <stdint.h>
+#elif defined(_WIN32)
+    typedef __int32 int32_t;
+    typedef unsigned __int32 uint32_t;
+    typedef __int64 int64_t;
+    typedef unsigned __int64 uint64_t;
+#else
+    typedef signed   int  int32_t;
+    typedef unsigned int uint32_t;
+    #if defined(__ia64__) || defined(__x86_64__)
+        typedef signed   long int  int64_t;
+        typedef unsigned long int uint64_t;
+    #else
+        typedef signed   long long int  int64_t;
+        typedef unsigned long long int uint64_t;
+    #endif
+#endif
diff --git a/make/stub_includes/replacement/stddef.h b/make/stub_includes/replacement/stddef.h
new file mode 100644
index 0000000..8aa7005
--- /dev/null
+++ b/make/stub_includes/replacement/stddef.h
@@ -0,0 +1,7 @@
+#if defined(_WIN64)
+    typedef __int64 ptrdiff_t;
+#elif defined(__ia64__) || defined(__x86_64__)
+    typedef long int ptrdiff_t;
+#else
+    typedef int ptrdiff_t;
+#endif
diff --git a/make/stub_includes/replacement/stdint.h b/make/stub_includes/replacement/stdint.h
new file mode 100644
index 0000000..cb4f143
--- /dev/null
+++ b/make/stub_includes/replacement/stdint.h
@@ -0,0 +1,18 @@
+#if defined(WIN32) && defined(__GNUC__)
+    #include <stdint.h>
+#elif defined(_WIN32)
+    typedef __int32 int32_t;
+    typedef unsigned __int32 uint32_t;
+    typedef __int64 int64_t;
+    typedef unsigned __int64 uint64_t;
+#else
+    typedef signed   int  int32_t;
+    typedef unsigned int uint32_t;
+    #if defined(__ia64__) || defined(__x86_64__)
+        typedef signed   long int  int64_t;
+        typedef unsigned long int uint64_t;
+    #else
+        typedef signed   long long int  int64_t;
+        typedef unsigned long long int uint64_t;
+    #endif
+#endif