diff options
| author | Sven Gothel <[email protected]> | 2011-09-14 05:39:22 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-09-14 05:39:22 +0200 |
| commit | d78568abedd21947a94f4dbadad42cbb5e7fb203 (patch) | |
| tree | ec777ffcedec0c668364ef0d0f189ec613b1e9e0 /make/build-jogl.xml | |
| parent | c015e19f2f3648fd729cfb3a53798c71983afc4b (diff) | |
Remove duplicates in jogl.test.jar, jogl.util.jar, jogl.util.fixedfuncemu.jar
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 47511333d..c03f2f898 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -157,15 +157,15 @@ <property name="java.part.util.graph.shadercode" value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/> - <property name="java.part.nonjava" - value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> - <property name="java.part.util.fixedfuncemu" value="jogamp/opengl/util/glsl/fixedfunc/**"/> <property name="java.part.util.fixedfuncemu.shadercode" value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/> + <property name="java.part.nonjava" + value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + <property name="java.part.all-desktop" value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glugldesktop} ${java.part.util.gldesktop}"/> @@ -1550,14 +1550,10 @@ <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> - <fileset dir="${src.java}" - includes="${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> - <fileset dir="${src.java}" - includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true"> <fileset dir="${classes}" |