diff options
| -rw-r--r-- | make/build-common.xml | 5 | ||||
| -rw-r--r-- | make/build-jogl.xml | 11 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 22 |
3 files changed, 22 insertions, 16 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 89353ccd0..5be5fedc7 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -66,8 +66,9 @@ <property name="config" value="${make}/config" /> <property name="stub.includes" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> - <property name="stub.includes.gluegen.gg" value="${gluegen.root}/make/stub_includes/gluegen" /> - <property name="stub.includes.gluegen.cc" value="${gluegen.root}/make/stub_includes/platform" /> + <property name="stub.includes.gluegen" value="${gluegen.root}/make/stub_includes" /> + <property name="stub.includes.gluegen.gg" value="${stub.includes.gluegen}/gluegen" /> + <property name="stub.includes.gluegen.cc" value="${stub.includes.gluegen}/platform" /> <property name="jogl.build.number" value="manual"/> <property name="jogl.build.id" value="${version.timestamp}"/> 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" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 92a2bf9d0..b3a02b9b9 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -127,16 +127,14 @@ <include name="${stub.includes}/macosx/**" /> <include name="${stub.includes}/win32/**" /> <include name="${stub.includes}/x11/**" /> - <include name="${stub.includes}/gluegen/**" /> <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}"> <include name="macosx/**" /> <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.nativewindow}"> @@ -144,6 +142,9 @@ <include name="*.java" /> <include name="*.c" /> </fileset> + <fileset id="stub.includes.dependencies.fileset.4" dir="${stub.includes.gluegen}"> + <include name="jni/**" /> + </fileset> <!-- The javadoc dirs. --> <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" /> @@ -186,6 +187,7 @@ <srcfileset refid="stub.includes.dependencies.fileset.1" /> <srcfileset refid="stub.includes.dependencies.fileset.2" /> <srcfileset refid="stub.includes.dependencies.fileset.3" /> + <srcfileset refid="stub.includes.dependencies.fileset.4" /> <targetfileset dir="${src.generated}"> <include name="**/*.java" /> <include name="**/*.c" /> @@ -205,6 +207,7 @@ <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> + <srcfiles refid="stub.includes.dependencies.fileset.4" /> </uptodate> <condition property="java.generate.skip"> @@ -243,7 +246,7 @@ outputRootDir="${build.nativewindow}" config="${jawt.cfg}" includeRefid="stub.includes.fileset.platform" - literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/jni" + literalInclude="${stub.includes.gluegen.gg}, ${stub.includes.gluegen}/jni, ${stub.includes.gluegen}/jni/${jni.platform.sub}" emitter="com.jogamp.gluegen.JavaEmitter" debug="false" dumpCPP="false"> @@ -253,7 +256,7 @@ <target name="java.generate.platforms" > <echo message="Generating platform-specifics: os: ${window.os.system}, cfgs: ${windowlib.os.cfg}, ${jawt.cfg}" /> - <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes.gluegen}/gluegen/** ${stub.includes}/khr/**" /> <antcall target="java.generate.windowlib" inheritRefs="true" /> <antcall target="java.generate.jawt" inheritRefs="true" /> </target> @@ -274,7 +277,8 @@ <param name="window.os.system" value="x11"/> <param name="windowlib.os.cfg" value="${config.nativewindow}/x11-lib.cfg" /> <param name="jawt.cfg" value="${config.nativewindow}/jawt-x11.cfg" /> - <param name="jawt.platform.header" value="${stub.includes}/jni/x11/jawt_md.h" /> + <param name="jawt.platform.header" value="${stub.includes.gluegen}/jni/x11/jawt_md.h" /> + <param name="jni.platform.sub" value="x11" /> </antcall> <echo message="Generating platform-specifics: Win32" /> @@ -282,14 +286,16 @@ <param name="window.os.system" value="win32"/> <param name="windowlib.os.cfg" value="${config.nativewindow}/win32-lib.cfg" /> <param name="jawt.cfg" value="${config.nativewindow}/jawt-win32.cfg" /> - <param name="jawt.platform.header" value="${stub.includes}/jni/win32/jawt_md.h" /> + <param name="jawt.platform.header" value="${stub.includes.gluegen}/jni/win32/jawt_md.h" /> + <param name="jni.platform.sub" value="win32" /> </antcall> <echo message="Generating platform-specifics: MacOSX" /> <antcall target="java.generate.platforms" inheritRefs="true"> <param name="window.os.system" value="macosx"/> <param name="jawt.cfg" value="${config.nativewindow}/jawt-macosx.cfg" /> - <param name="jawt.platform.header" value="${stub.includes}/jni/macosx/jawt_md.h" /> + <param name="jawt.platform.header" value="${stub.includes.gluegen}/jni/macosx/jawt_md.h" /> + <param name="jni.platform.sub" value="macosx" /> </antcall> <!-- Inform the user that the generators have successfully created |