diff options
| author | Sven Gothel <[email protected]> | 2015-03-24 03:55:37 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-24 03:55:37 +0100 |
| commit | 1edd563607867a8f3f5cc6d764c6d6462179aa0b (patch) | |
| tree | 99e108eca9747780996a32362b486f5726ee979b /make/build-jogl.xml | |
| parent | 9fb45e70730198fa7be940c5b48dd5c59bf04b93 (diff) | |
Adapt to new JNI header location within GlueGen, completes commit 9fb45e70730198fa7be940c5b48dd5c59bf04b93
JNI header moved to GlueGen via commit 532b8df474976b474f0cf4eb2d93588ded2ad3fe
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 9bd98490c..0f1b435c2 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -260,7 +260,7 @@ <include name="${stub.includes}/win32/**" /> <include name="${stub.includes}/x11/**" /> <include name="${stub.includes}/khr/**" /> - <include name="${stub.includes}/jni/**" /> + <include name="${stub.includes.gluegen}/jni/**" /> </dirset> <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}"> @@ -269,7 +269,6 @@ <include name="win32/**" /> <include name="x11/**" /> <include name="common/**" /> - <include name="jni/**" /> </fileset> <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" /> <fileset id="stub.includes.dependencies.fileset.3" dir="${config.jogl}"> @@ -285,7 +284,7 @@ <include name="${stub.includes}/win32/**" /> <include name="${stub.includes}/x11/**" /> <include name="${stub.includes}/khr/**" /> - <include name="${stub.includes}/jni/**" /> + <include name="${stub.includes.gluegen}/jni/**" /> </dirset> <fileset id="stub.includes.cg.dependencies.fileset" dir="."> <include name="${stub.includes}/cg/**" /> @@ -726,7 +725,7 @@ <target name="java.generate.window.system.es" if="window.es.cfg"> <echo message="Generating EGL implementation class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes.gluegen}/gluegen/** ${stub.includes}/khr/**" /> <gluegen src="${stub.includes}/${window.es.system}/window-system1.c" outputRootDir="${build.jogl}" config="${window.es.cfg}" @@ -741,7 +740,7 @@ <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg"> <echo message="Generating EGLExt implementation class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes.gluegen}/gluegen/** ${stub.includes}/khr/**" /> <gluegen src="${stub.includes}/${window.es.system}/window-system-ext.c" outputRootDir="${build.jogl}" config="${window.es.ext.cfg}" @@ -780,7 +779,7 @@ </target> <target name="java.generate.gl.platforms" > - <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/** ${stub.includes}/opengl/**" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes.gluegen}/gluegen/** ${stub.includes}/khr/** ${stub.includes}/opengl/**" /> <antcall target="java.generate.window.system.os0" inheritRefs="true" /> <antcall target="java.generate.window.system.os1" inheritRefs="true" /> |