cleaned up resources folder structure and build.

12 files changed, 13 insertions, 24 deletions

diff --git a/build.xml b/build.xml
index e014b5c8..d54f4dc5 100644
--- a/build.xml
+++ b/build.xml
@@ -30,9 +30,10 @@
 
         <!--OpenCL Impl including OpenGL interoperability-->
         <dirset id="jocl.include.path" dir="${basedir}">
-            <include name="resources"/>
-            <include name="resources/CL"/>
-            <include name="resources/jvm_stubs"/>
+            <include name="resources/includes"/>
+            <include name="resources/stubs_includes/jvm"/>
+            <include name="resources/stubs_includes/gl"/>
+            <include name="resources/stubs_includes/common"/>
         </dirset>
 
         <echo message=" - - - generate JOCL binding files - - - "/>
@@ -97,18 +98,14 @@
                 <includepath path="${java.includes.dir}"/>
                 <includepath path="${java.includes.dir.platform}"/>
 
-            <!-- TODO should we use our own or jogl's GL headers?  -->
-                <includepath path="${basedir}/resources/includes"/>
+                <!-- TODO should we use our own or jogl's GL headers?  -->
+                <includepath path="${basedir}/resources/includes/CL"/>
                 <includepath path="${basedir}/resources/includes/GL3"/>
+
             <!--
                 <includepath path="${jogl.root}/make/stub_includes/opengl/GL3"/>
                 <includepath path="${jogl.root}/make/stub_includes/opengl"/>
-
-                -L/usr/X11R6/lib64 -lGL -L/usr/X11R6/lib64 -lX11 -L/usr/X11R6/lib64 -lXxf86vm
-
             -->
-                <includepath path="${basedir}/resources"/>
-                <includepath path="${basedir}/resources/CL"/>
 
             </compiler>
 
@@ -147,9 +144,6 @@
     </target>
 
 
-    <target name="-post-jar" depends="javadoc">
-    </target>
-
     <!--
 
     There exist several targets which are by default empty and which can be 
diff --git a/etc/FunctionParamUncommenter.java b/etc/FunctionParamUncommenter.java
index 456bd281..9296895e 100644
--- a/etc/FunctionParamUncommenter.java
+++ b/etc/FunctionParamUncommenter.java
@@ -29,9 +29,11 @@ public class FunctionParamUncommenter {
             = compile("\\s*(const)?\\w+\\s* \\**\\s+ (/\\*) \\s+[^\\*\\[]+ (\\*/)", MULTILINE|COMMENTS);
                                                                      //^ array size in param name causes some problems
 
+    //TODO integrate in build...
     public static void main(String[] args) throws FileNotFoundException, IOException {
-        uncomment("/home/mbien/NetBeansProjects/JOGL/jocl/resources/CL/cl.h", false);
-        uncomment("/home/mbien/NetBeansProjects/JOGL/jocl/resources/CL/cl_gl.h", false);
+        String path = "/home/mbien/NetBeansProjects/JOGL/jocl/resources/includes/CL/";
+        uncomment(path + "cl.h", false);
+        uncomment(path + "cl_gl.h", false);
     }
 
     private static void uncomment(String file, boolean replace) throws FileNotFoundException, IOException {
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 67e2f346..1138fc56 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -48,7 +48,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=Java Binding to OpenCL
 jnlp.codebase.type=local
-jnlp.codebase.url=file:/home/mbien/NetBeansProjects/JOGL/jocl/dist/
+jnlp.codebase.url=file:${basedir}/dist/
 jnlp.descriptor=application
 jnlp.enabled=false
 jnlp.offline-allowed=false
@@ -64,7 +64,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Djava.library.path="/home/mbien/NetBeansProjects/JOGL/jocl/build/natives/jocl"
+run.jvmargs=-Djava.library.path="${basedir}/build/natives/jocl"
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg
index 58b31880..87e7b306 100644
--- a/resources/cl-common.cfg
+++ b/resources/cl-common.cfg
@@ -12,8 +12,6 @@ Opaque long cl_program
 Opaque long cl_kernel
 Opaque long cl_event
 Opaque long cl_sampler
-
-# TODO doublecheck if not int
 Opaque long cl_platform_id
 Opaque long cl_device_id
 
diff --git a/resources/CL/cl.h b/resources/includes/CL/cl.h
index 4a2c6712..4a2c6712 100644
--- a/resources/CL/cl.h
+++ b/resources/includes/CL/cl.h
diff --git a/resources/CL/cl_gl.h b/resources/includes/CL/cl_gl.h
index 4eab6d7a..4eab6d7a 100644
--- a/resources/CL/cl_gl.h
+++ b/resources/includes/CL/cl_gl.h
diff --git a/resources/CL/cl_platform.h b/resources/includes/CL/cl_platform.h
index 775e9ae8..775e9ae8 100644
--- a/resources/CL/cl_platform.h
+++ b/resources/includes/CL/cl_platform.h
diff --git a/resources/CL/stddef.h b/resources/stubs_includes/common/stddef.h
index fde2fe19..da2325af 100644
--- a/resources/CL/stddef.h
+++ b/resources/stubs_includes/common/stddef.h
@@ -8,5 +8,3 @@
 
 #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/stubs_includes/common/stdint.h
index 8fd0d29f..5c2a4a2e 100644
--- a/resources/CL/stdint.h
+++ b/resources/stubs_includes/common/stdint.h
@@ -20,9 +20,6 @@
 
     typedef unsigned long     size_t;
 
-    // FIXME workaround prevent re-defininition of int16_t in types.h
-    #  define __int8_t_defined
-
     /* Greatest-width integer types */
     /* Modern GCCs provide __INTMAX_TYPE__ */
     #if defined(__INTMAX_TYPE__)
diff --git a/resources/gltypes.h b/resources/stubs_includes/gl/gltypes.h
index 3272b72a..3272b72a 100644
--- a/resources/gltypes.h
+++ b/resources/stubs_includes/gl/gltypes.h
diff --git a/resources/jvm_stubs/jni.h b/resources/stubs_includes/jvm/jni.h
index be01d018..be01d018 100644
--- a/resources/jvm_stubs/jni.h
+++ b/resources/stubs_includes/jvm/jni.h
diff --git a/resources/jvm_stubs/jni_md.h b/resources/stubs_includes/jvm/jni_md.h
index 44978627..44978627 100644
--- a/resources/jvm_stubs/jni_md.h
+++ b/resources/stubs_includes/jvm/jni_md.h