diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/make/build.xml b/make/build.xml index 72d230942..971406f06 100644 --- a/make/build.xml +++ b/make/build.xml @@ -117,7 +117,7 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> - <path refid="nativewindow_all-mobile_atoms.classpath"/> + <path refid="nativewindow_all-noawt_atoms.classpath"/> <path refid="jogl_all-mobile_atoms.classpath"/> <path refid="newt_all-mobile_atoms.classpath"/> </zips> @@ -126,9 +126,10 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> - <path refid="nativewindow_all-mobile_atoms.classpath"/> + <path refid="nativewindow_core_atoms.classpath"/> <path refid="jogl_all-mobile_atoms.classpath"/> <path refid="newt_all-android_atoms.classpath"/> + <fileset dir="${build.gluegen}" includes="gluegen-rt.jar"/> <!-- JAU hack in gluegen --> </zips> </archives> </jar> @@ -147,6 +148,9 @@ </target> <target name="android.package" depends="init,gluegen.cpptasks.detect.os,android.package.skip.check" if="isAndroid" unless="android.package.skip"> + <copy todir="${lib}"> + <fileset dir="${build.gluegen}/obj" includes="libgluegen-rt.so"/> <!-- JAU hack in gluegen --> + </copy> <aapt.signed jarbuilddir="${jar}" jarbasename="jogl.all-android" @@ -157,6 +161,9 @@ jarmanifest.path="${build.jogl}/manifest.mf" version.code="${jogl_int_version}" version.name="${jogl.version.plus}" /> + <delete includeEmptyDirs="true" quiet="true" failonerror="false"> + <fileset dir="${lib}" includes="libgluegen-rt.so" /> + </delete> </target> <target name="android.launcher" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> @@ -238,19 +245,13 @@ <target name="developer-src-zip" depends="init"> <!--delete includeEmptyDirs="true" quiet="true" failonerror="false"> - <fileset dir="${build}" includes="nativewindow-java-src.zip" /> <fileset dir="${build}" includes="jogl-java-src.zip" /> - <fileset dir="${build}" includes="newt-java-src.zip" /> </delete--> - <zip destfile="${build}/nativewindow-java-src.zip" level="0"> + <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/nativewindow/classes"/> <fileset dir="${build}/nativewindow/gensrc/classes"/> - </zip> - <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/jogl/classes"/> <fileset dir="${build}/jogl/gensrc/classes"/> - </zip> - <zip destfile="${build}/newt-java-src.zip" level="0"> <fileset dir="${src}/newt/classes"/> </zip> </target> @@ -290,9 +291,7 @@ </copy> <copy todir="${archive}"> <fileset dir="${build}"> - <include name="nativewindow-java-src.zip"/> <include name="jogl-java-src.zip"/> - <include name="newt-java-src.zip"/> </fileset> </copy> <archive.7z destfile="${build}/${archive.name}.7z" |