fixed double typedef in build

8 files changed, 37 insertions, 34 deletions

diff --git a/build.xml b/build.xml
index efed11fa..38e0e290 100644
--- a/build.xml
+++ b/build.xml
@@ -24,9 +24,10 @@
             <pathelement location="../gluegen/build/antlr-2.7.7.jar" />
         </path>
 
-        <dirset id="include.path" dir="${basedir}">
+        <dirset id="jocl.include.path" dir="${basedir}">
             <include name="resources"/>
             <include name="resources/CL"/>
+            <include name="resources/jvm_stubs"/>
         </dirset>
 
         <!--OpenCL-->
@@ -34,7 +35,7 @@
         <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" />
         <gluegen src="resources/cl.h"
                  config="resources/OpenCL.cfg"
-                 includeRefid="include.path"
+                 includeRefid="jocl.include.path"
                  emitter="com.sun.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -79,10 +80,9 @@
 
             <compiler extends="${compiler.cfg.id}" >
 
-                <includepath path="${basedir}/resources/jvm_stubs"/>
-
                 <includepath path="${basedir}/resources"/>
                 <includepath path="${basedir}/resources/CL"/>
+                <includepath path="${basedir}/resources/jvm_stubs"/>
 
             <!-- This is for the generated headers for handwritten C code -->
             <!--
@@ -111,8 +111,10 @@
     <target name="c.configure.linux.amd64" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
         <echo message="configure for Linux.AMD64 build" />
 
+        <property name="c.linker.ext.path" value="/home/mbien/NVIDIA_GPU_Computing_SDK/OpenCL/common/lib/Linux64"/>
+
         <linker id="linker.cfg.linux.amd64.jocl" extends="linker.cfg.linux.amd64">
-            <syslibset dir="/home/mbien/NVIDIA_GPU_Computing_SDK/OpenCL/common/lib/Linux64" libs="OpenCL"/>
+            <syslibset dir="${c.linker.ext.path}" libs="OpenCL"/>
         </linker>
 
         <property name="compiler.cfg.id" value="compiler.cfg.linux" />
diff --git a/resources/CL/stddef.h b/resources/CL/stddef.h
index 8aa70051..fde2fe19 100644
--- a/resources/CL/stddef.h
+++ b/resources/CL/stddef.h
@@ -5,3 +5,8 @@
 #else
     typedef int ptrdiff_t;
 #endif
+
+#define NULL ((void *)0)
+    typedef int wchar_t;
+
+#include <inttypes.h>
\ No newline at end of file
diff --git a/resources/CL/stdint.h b/resources/CL/stdint.h
index f8bee857..6db5e110 100644
--- a/resources/CL/stdint.h
+++ b/resources/CL/stdint.h
@@ -1,3 +1,4 @@
+
 #if defined(_WIN32)
     #error windows does not support stdint.h
     // typedef signed   __int32 int32_t;
@@ -6,9 +7,11 @@
     // typedef unsigned __int64 uint64_t;
 #else
 
+// only needed for src generation, not later at compile time
     typedef signed   char     int8_t;
     typedef unsigned short    int16_t;
     typedef          int      int32_t;
+
     typedef unsigned char     uint8_t;
     typedef unsigned short    uint16_t;
     typedef unsigned int      uint32_t;
@@ -17,7 +20,26 @@
     typedef unsigned int      uintptr_t;
 
     typedef unsigned int      size_t;
+    #  define __int8_t_defined
 
+    /* Greatest-width integer types */
+    /* Modern GCCs provide __INTMAX_TYPE__ */
+    #if defined(__INTMAX_TYPE__)
+      typedef __INTMAX_TYPE__ intmax_t;
+    #elif __have_longlong64
+      typedef signed long long intmax_t;
+    #else
+      typedef signed long intmax_t;
+    #endif
+
+    /* Modern GCCs provide __UINTMAX_TYPE__ */
+    #if defined(__UINTMAX_TYPE__)
+      typedef __UINTMAX_TYPE__ uintmax_t;
+    #elif __have_longlong64
+      typedef unsigned long long uintmax_t;
+    #else
+      typedef unsigned long uintmax_t;
+    #endif
 
     #if defined(__ia64__) || defined(__x86_64__)
         typedef signed   long int  int64_t;
diff --git a/resources/OpenCL.cfg b/resources/OpenCL.cfg
index 03c89280..768ebe9f 100644
--- a/resources/OpenCL.cfg
+++ b/resources/OpenCL.cfg
@@ -25,9 +25,9 @@ Opaque long cl_kernel
 Opaque long cl_event
 Opaque long cl_sampler
 
-Opaque int cl_platform_id
-Opaque int cl_device_id
+Opaque long cl_platform_id
+Opaque long cl_device_id
 
 #append to generated c files
 CustomCCode #include <cl.h>
-#CustomCCode #include <CL/stdint.h>
+CustomCCode #include <inttypes.h>
diff --git a/resources/example1/Test.cfg b/resources/example1/Test.cfg
deleted file mode 100644
index 61b0a54f..00000000
--- a/resources/example1/Test.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-Package com.test
-Style AllStatic
-JavaClass Test
-JavaOutputDir   gensrc/java
-NativeOutputDir gensrc/native
diff --git a/resources/example1/function.c b/resources/example1/function.c
deleted file mode 100644
index 9a84189b..00000000
--- a/resources/example1/function.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int one_plus(int a) {
-  return 1 + a;
-}
diff --git a/resources/example1/function.h b/resources/example1/function.h
deleted file mode 100644
index 58976c1f..00000000
--- a/resources/example1/function.h
+++ /dev/null
@@ -1 +0,0 @@
-int one_plus(int a);
diff --git a/resources/example1/gen.sh b/resources/example1/gen.sh
deleted file mode 100644
index 6fb971e2..00000000
--- a/resources/example1/gen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/ksh
-
-JAVA=java
-GLUEGEN_JAR=../../../build/gluegen.jar
-ANTLR_JAR=../../../../../ANTLR/antlr-2.7.4/antlr.jar
-
-NAME=`uname`
-
-if [ $NAME="Windows*" ] ; then
-  SEP=\;
-elif [ $NAME="CYGWIN*" ] ; then
-  SEP=\;
-else
-  SEP=:
-fi
-
-java -cp $GLUEGEN_JAR$SEP$ANTLR_JAR com.sun.gluegen.GlueGen -I. -Ecom.sun.gluegen.JavaEmitter -Cfunction.cfg function.h