diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 16 | ||||
| -rw-r--r-- | make/build-newt.xml | 28 | ||||
| -rw-r--r-- | make/build-staticglgen.xml | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 9b81c9149..cfdbf75e8 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1591,7 +1591,7 @@ <target name="build-jars-all-awt-javase" depends="setup-manifestfile" unless="setup.noAWT"> <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.openmax}"> + includes="${java.part.openmax}"> <include name="javax/media/opengl/**" /> <include name="com/jogamp/gluegen/runtime/**" /> <include name="com/jogamp/opengl/**" /> @@ -1604,12 +1604,12 @@ <target name="build-jars-all-noawt-javase" depends="setup-manifestfile"> <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.openmax}" - excludes="${java.part.awt} ${java.part.util.awt}"> + includes="${java.part.openmax}" + excludes="${java.part.awt} ${java.part.util.awt}"> <include name="javax/media/opengl/**" /> - <include name="com/jogamp/gluegen/runtime/**" /> - <include name="com/jogamp/opengl/**" /> - <include name="jogamp/opengl/**" /> + <include name="com/jogamp/gluegen/runtime/**" /> + <include name="com/jogamp/opengl/**" /> + <include name="jogamp/opengl/**" /> </fileset> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> @@ -1618,8 +1618,8 @@ <target name="build-jars-all-cdc" depends="setup-manifestfile"> <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" - includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}" - excludes="${java.excludes.cdcfp}"/> + includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}" + excludes="${java.excludes.cdcfp}"/> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> diff --git a/make/build-newt.xml b/make/build-newt.xml index 68b527ab6..7ad013f6c 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -675,18 +675,18 @@ <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT"> <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true"> <fileset dir="${classes}"> - <include name="com/jogamp/newt/**" /> - <include name="jogamp/newt/**" /> + <include name="com/jogamp/newt/**" /> + <include name="jogamp/newt/**" /> </fileset> </jar> <jar manifest="tempversion" destfile="${newt.event.jar}" filesonly="true"> <fileset dir="${classes}"> - <include name="com/jogamp/newt/Display*" /> - <include name="com/jogamp/newt/Screen*" /> - <include name="com/jogamp/newt/Window*" /> - <include name="com/jogamp/newt/ScreenMode*" /> - <include name="com/jogamp/newt/event/**" /> - <include name="jogamp/newt/Debug*" /> + <include name="com/jogamp/newt/Display*" /> + <include name="com/jogamp/newt/Screen*" /> + <include name="com/jogamp/newt/Window*" /> + <include name="com/jogamp/newt/ScreenMode*" /> + <include name="com/jogamp/newt/event/**" /> + <include name="jogamp/newt/Debug*" /> </fileset> </jar> </target> @@ -694,9 +694,9 @@ <target name="build-jars-all-noawt" depends="setup-manifestfile"> <jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true"> <fileset dir="${classes}" - excludes="${java.part.awt}"> - <include name="com/jogamp/newt/**" /> - <include name="jogamp/newt/**" /> + excludes="${java.part.awt}"> + <include name="com/jogamp/newt/**" /> + <include name="jogamp/newt/**" /> </fileset> </jar> </target> @@ -704,9 +704,9 @@ <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc"> <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" - excludes="${java.excludes.cdcfp}" > - <include name="com/jogamp/newt/**" /> - <include name="jogamp/newt/**" /> + excludes="${java.excludes.cdcfp}" > + <include name="com/jogamp/newt/**" /> + <include name="jogamp/newt/**" /> </fileset> </jar> </target> diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml index 968e3501b..505129d6d 100644 --- a/make/build-staticglgen.xml +++ b/make/build-staticglgen.xml @@ -52,7 +52,7 @@ - itself is built in a separate task. --> <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="${javacdebuglevel}" includeAntRuntime="false"> - <src path="${src.java}" /> + <src path="${src.java}" /> <classpath refid="classpath" /> </javac> |