diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 17 | ||||
| -rw-r--r-- | make/build-newt.xml | 16 | ||||
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png | bin | 396 -> 0 bytes | |||
| -rw-r--r-- | make/resources/assets/newt/data/cross-grey-alpha-16x16.png | bin | 286 -> 0 bytes | |||
| -rw-r--r-- | make/resources/assets/newt/data/jogamp-16x16.png | bin | 549 -> 0 bytes | |||
| -rw-r--r-- | make/resources/assets/newt/data/jogamp-32x32.png | bin | 1020 -> 0 bytes | |||
| -rw-r--r-- | make/resources/assets/newt/data/pointer-grey-alpha-16x24.png | bin | 511 -> 0 bytes |
7 files changed, 24 insertions, 9 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index ed5919b94..e4bb28063 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -90,11 +90,18 @@ <property name="java.part.gluegen-gl-rt" value="com/jogamp/gluegen/runtime/opengl/*"/> + <property name="java.part.core.shadercode" + value="jogamp/opengl/shader/* jogamp/opengl/shader/bin/**"/> + + <property name="java.part.core.assets" + value="jogamp/opengl/assets/**"/> + <property name="java.part.core.util" - value="com/jogamp/opengl/util/* jogamp/opengl/util/* com/jogamp/opengl/util/glsl/* jogamp/opengl/util/glsl/* jogamp/opengl/shader/**"/> + value="com/jogamp/opengl/util/* jogamp/opengl/util/* com/jogamp/opengl/util/glsl/* jogamp/opengl/util/glsl/* ${java.part.core.shadercode} ${java.part.core.assets}"/> <property name="java.part.core" value="${java.part.gluegen-gl-rt} com/jogamp/opengl/* com/jogamp/opengl/fixedfunc/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/> + <property name="java.part.core.exclude" value="com/jogamp/opengl/Debug* com/jogamp/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/> <property name="java.part.nv-cg" @@ -175,9 +182,6 @@ <property name="java.part.util.graph.fonts" value="jogamp/graph/font/fonts/**"/> - <property name="java.part.core.shadercode" - value="jogamp/opengl/shader/* jogamp/opengl/shader/bin/**"/> - <property name="java.part.util.shadercode" value="jogamp/opengl/util/stereo/shader/*"/> @@ -191,7 +195,7 @@ value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/> <property name="java.part.nonjava" - value="${java.part.core.shadercode} ${java.part.util.shadercode} ${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + value="${java.part.core.assets} ${java.part.core.shadercode} ${java.part.util.shadercode} ${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> <!-- condition excludes --> @@ -1229,7 +1233,7 @@ <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase" /> <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass"> - <!-- make shadercode and fonts available in classpath --> + <!-- make shadercode, fonts etc available in classpath --> <copy todir="${classes}"> <fileset dir="${src.java}" includes="${java.part.nonjava}" @@ -1950,7 +1954,6 @@ <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.openal}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu} ${java.part.util.graph}"/> - <fileset dir="resources/assets" includes="jogl/util/data/**" /> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-graph.jar}" filesonly="true"> <fileset dir="${classes}" diff --git a/make/build-newt.xml b/make/build-newt.xml index 8df13ae49..15db39653 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -105,6 +105,9 @@ <property name="java.part.core" value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/> + <property name="java.part.core.assets" + value="jogamp/newt/assets/**"/> + <property name="java.part.opengl" value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/> @@ -156,6 +159,9 @@ <property name="java.part.driver.android" value="jogamp/newt/driver/android/**"/> + <property name="java.part.nonjava" + value="${java.part.core.assets}"/> + <!-- condition excludes --> <condition property="java.excludes.awt" @@ -441,6 +447,13 @@ <src path="${src.java}" /> <classpath refid="jogl_nativewindow_gluegen.classpath"/> </javac> + + <!-- make shadercode, fonts etc available in classpath --> + <copy todir="${classes}"> + <fileset dir="${src.java}" + includes="${java.part.nonjava}" + excludes="**/*.java"/> + </copy> </target> <target name="java.compile.android" if="android-jars.available"> @@ -1134,8 +1147,7 @@ <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-swt,build-jars-javafx,build-jars-driver"> <jar manifest="${build.newt}/manifest.mf" destfile="${newt.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.core}"/> - <fileset dir="resources/assets" includes="newt/data/**" /> + includes="${java.part.core} ${java.part.nonjava}"/> </jar> <jar manifest="${build.newt}/manifest.mf" destfile="${newt-event.jar}" filesonly="true"> <fileset dir="${classes}"> diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png Binary files differdeleted file mode 100644 index 4601a214e..000000000 --- a/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png +++ /dev/null diff --git a/make/resources/assets/newt/data/cross-grey-alpha-16x16.png b/make/resources/assets/newt/data/cross-grey-alpha-16x16.png Binary files differdeleted file mode 100644 index 303c454fa..000000000 --- a/make/resources/assets/newt/data/cross-grey-alpha-16x16.png +++ /dev/null diff --git a/make/resources/assets/newt/data/jogamp-16x16.png b/make/resources/assets/newt/data/jogamp-16x16.png Binary files differdeleted file mode 100644 index 02df8997f..000000000 --- a/make/resources/assets/newt/data/jogamp-16x16.png +++ /dev/null diff --git a/make/resources/assets/newt/data/jogamp-32x32.png b/make/resources/assets/newt/data/jogamp-32x32.png Binary files differdeleted file mode 100644 index ab21c6e1b..000000000 --- a/make/resources/assets/newt/data/jogamp-32x32.png +++ /dev/null diff --git a/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png b/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png Binary files differdeleted file mode 100644 index 98b2c8640..000000000 --- a/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png +++ /dev/null |
