aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml2
-rw-r--r--resources/cl-common.cfg2
-rw-r--r--resources/cl-impl.cfg1
-rw-r--r--resources/includes/CL_orig/cl_platform.h2
4 files changed, 5 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 40c66214..8ce52565 100644
--- a/build.xml
+++ b/build.xml
@@ -104,7 +104,7 @@
<target name="tag.build">
<property file="${dist.jar.dir}/artifact.properties"/>
<property name="jocl.build.number" value="manual-build"/>
- <copy file="${jogl.root}/${rootrel.build}/artifact.properties" todir="${dist.jar.dir}" overwrite="true"/>
+ <copy file="${jogl.root}/${rootrel.build}/artifact.properties" todir="${dist.jar.dir}" overwrite="true" failonerror="false"/>
<echo file="${dist.jar.dir}/artifact.properties" message="jocl.build.number=${jocl.build.number}${line.separator}" append="true" />
</target>
diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg
index fab403b5..c98fb9b6 100644
--- a/resources/cl-common.cfg
+++ b/resources/cl-common.cfg
@@ -106,3 +106,5 @@ TagNativeBinding true
# platform dependent extensions
Ignore .*APPLE.*
+
+Ignore nanf
diff --git a/resources/cl-impl.cfg b/resources/cl-impl.cfg
index 856c85cd..4a34683e 100644
--- a/resources/cl-impl.cfg
+++ b/resources/cl-impl.cfg
@@ -52,6 +52,7 @@ ArgumentIsString clGetExtensionFunctionAddressImpl 0
#append to generated c files
CustomCCode #include <CL/cl.h>
+CustomCCode #include <CL/cl_ext.h>
CustomCCode #include <CL/cl_gl.h>
CustomCCode #include <GL3/gl3.h>
CustomCCode #include <inttypes.h>
diff --git a/resources/includes/CL_orig/cl_platform.h b/resources/includes/CL_orig/cl_platform.h
index 043b0489..8ef99ff1 100644
--- a/resources/includes/CL_orig/cl_platform.h
+++ b/resources/includes/CL_orig/cl_platform.h
@@ -405,7 +405,7 @@ typedef unsigned int cl_GLenum;
/* #define CL_ALIGNED(_x) _CRT_ALIGN(_x) */
#define CL_ALIGNED(_x)
#else
- #warning Need to implement some method to align data here
+ #warning "Need to implement some method to align data here"
#define CL_ALIGNED(_x)
#endif