diff options
| -rw-r--r-- | build.xml | 25 | ||||
| -rw-r--r-- | nbproject/project.properties | 6 | ||||
| -rw-r--r-- | resources/cl-impl.cfg (renamed from resources/OpenCL.cfg) | 0 |
3 files changed, 15 insertions, 16 deletions
@@ -13,15 +13,17 @@ <import file="nbproject/build-impl.xml"/> + <property name="gluegen.root" value="${basedir}/../gluegen" /> + <property name="jogl.root" value="${basedir}/../jogl" /> + <!-- Pull in GlueGen cpptasks build file --> - <property name="gluegen.root" value="../gluegen" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> <target name="-pre-compile"> <path id="gluegen.classpath"> - <pathelement location="../gluegen/build/gluegen.jar" /> - <pathelement location="../gluegen/build/antlr-2.7.7.jar" /> + <pathelement location="${gluegen.root}/build/gluegen.jar" /> + <pathelement location="${gluegen.root}/build/antlr-2.7.7.jar" /> </path> <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" /> @@ -45,7 +47,7 @@ <echo message="generate GLImpl..."/> <gluegen src="resources/opencl.h" - config="resources/OpenCL.cfg" + config="resources/cl-impl.cfg" includeRefid="jocl.include.path" emitter="com.sun.gluegen.JavaEmitter"> <classpath refid="gluegen.classpath" /> @@ -90,18 +92,11 @@ <includepath path="${java.includes.dir}"/> <includepath path="${java.includes.dir.platform}"/> - <includepath path="${basedir}/../jogl/make/stub_includes/opengl/GL3"/> - <includepath path="${basedir}/../jogl/make/stub_includes/opengl"/> + <includepath path="${jogl.root}/make/stub_includes/opengl/GL3"/> + <includepath path="${jogl.root}/make/stub_includes/opengl"/> <includepath path="${basedir}/resources"/> <includepath path="${basedir}/resources/CL"/> - <!-- - <includepath path="${src.generated.c}" /> - <includepath path="${src.generated.c}/X11" if="isX11"/> - <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> - <includepath path="${src.generated.c}/Windows" if="isWindows"/> - --> - </compiler> <!-- @@ -132,6 +127,10 @@ <delete dir="gensrc"/> </target> + + <target name="-post-jar" depends="javadoc"> + </target> + <!-- There exist several targets which are by default empty and which can be diff --git a/nbproject/project.properties b/nbproject/project.properties index 523677b1..83e4d1cb 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -36,7 +36,7 @@ javac.test.classpath=\ ${build.classes.dir}:\ ${libs.junit_4.classpath} javadoc.additionalparam= -javadoc.author=false +javadoc.author=true javadoc.encoding=${source.encoding} javadoc.noindex=false javadoc.nonavbar=false @@ -45,9 +45,9 @@ javadoc.private=false javadoc.splitindex=true javadoc.use=true javadoc.version=false -javadoc.windowtitle= +javadoc.windowtitle=Java Binding to OpenCL jnlp.codebase.type=local -jnlp.codebase.url=file:/home/mbien/NetBeansProjects/JOGL2/JOCL/dist +jnlp.codebase.url=file:/home/mbien/NetBeansProjects/JOGL/jocl/dist/ jnlp.descriptor=application jnlp.enabled=false jnlp.offline-allowed=false diff --git a/resources/OpenCL.cfg b/resources/cl-impl.cfg index 5cf23c88..5cf23c88 100644 --- a/resources/OpenCL.cfg +++ b/resources/cl-impl.cfg |