diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 1 | ||||
| -rw-r--r-- | make/build-test.xml | 6 | ||||
| -rw-r--r-- | make/build.xml | 1 | ||||
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png | bin | 0 -> 2785 bytes | |||
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-640x360.tga (renamed from make/resources/assets-test/data/av/test-ntsc01-640x360.tga) | bin | 921644 -> 921644 bytes |
5 files changed, 4 insertions, 4 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 68888c830..804a29b55 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1669,6 +1669,7 @@ <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph} ${java.part.util.av}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> + <fileset dir="resources/assets" includes="jogl/util/**" /> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" diff --git a/make/build-test.xml b/make/build-test.xml index a69124672..0a290dcea 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -96,10 +96,8 @@ <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> - <fileset dir="${classes}" - includes="${java.part.test}"/> - <fileset dir="resources/assets-test" - includes="**" /> + <fileset dir="${classes}" includes="${java.part.test}"/> + <fileset dir="resources/assets-test" includes="**" /> </jar> </target> diff --git a/make/build.xml b/make/build.xml index 24670fcce..5f85f9a6e 100644 --- a/make/build.xml +++ b/make/build.xml @@ -155,6 +155,7 @@ <target name="android.jogl.package" depends="init,gluegen.cpptasks.detect.os,android.package.jogl.skip.check" if="isAndroid" unless="android.package.jogl.skip"> <aapt.signed + assetsdir="resources/assets" jarsrcdir="${src}/jogl/classes" jarbuilddir="${jar}" jarbasename="jogl.all-android" diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png Binary files differnew file mode 100644 index 000000000..3df47432e --- /dev/null +++ b/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png diff --git a/make/resources/assets-test/data/av/test-ntsc01-640x360.tga b/make/resources/assets/jogl/util/data/av/test-ntsc01-640x360.tga Binary files differindex 71ca3550c..71ca3550c 100644 --- a/make/resources/assets-test/data/av/test-ntsc01-640x360.tga +++ b/make/resources/assets/jogl/util/data/av/test-ntsc01-640x360.tga |
