diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 2 | ||||
| -rw-r--r-- | make/build-jogl.xml | 23 |
2 files changed, 21 insertions, 4 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 79d55b5f2..a7fef8ba6 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -291,6 +291,7 @@ <property name="jogl.glumipmap.jar" value="${build.jogl}/jogl.glu.mipmap.jar" /> <property name="jogl.util.fixedfuncemu.jar" value="${build.jogl}/jogl.util.fixedfuncemu.jar" /> <property name="jogl.awt.jar" value="${build.jogl}/jogl.awt.jar" /> + <property name="jogl.swt.jar" value="${build.jogl}/jogl.swt.jar" /> <property name="jogl.util.awt.jar" value="${build.jogl}/jogl.util.awt.jar" /> <property name="jogl.os.x11.jar" value="${build.jogl}/jogl.os.x11.jar" /> <property name="jogl.os.win.jar" value="${build.jogl}/jogl.os.win.jar" /> @@ -312,6 +313,7 @@ <pathelement location="${jogl.glumipmap.jar}" /> <pathelement location="${jogl.util.fixedfuncemu.jar}" /> <pathelement location="${jogl.awt.jar}" /> + <pathelement location="${jogl.swt.jar}" /> <pathelement location="${jogl.util.awt.jar}" /> <pathelement location="${jogl.os.x11.jar}" /> <pathelement location="${jogl.os.win.jar}" /> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index b14824ec4..02222225c 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -139,6 +139,9 @@ <property name="java.part.awt" value="javax/media/opengl/awt/** jogamp/opengl/**/awt/**"/> + + <property name="java.part.swt" + value="jogamp/opengl/**/swt/**"/> <property name="java.part.util" value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/*"/> @@ -180,13 +183,18 @@ <isset property="setup.noAWT"/> </condition> + <condition property="java.excludes.swt" + value="${java.part.swt}"> + <isset property="setup.noSWT"/> + </condition> + <property name="java.excludes.javadoc.packagenames" value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> <property name="java.excludes.fixme" value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" /> - <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt}" /> + <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt} ${java.excludes.swt}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> @@ -1516,7 +1524,7 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.egl} ${java.part.es1} ${java.part.es2}" - excludes="${java.part.awt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/> + excludes="${java.part.awt} ${java.part.swt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.dbg.jar}" filesonly="true"> <fileset dir="${classes}" @@ -1535,6 +1543,13 @@ </jar> </target> + <target name="build-jars-swt-javase" depends="setup-manifestfile" unless="setup.noSWT"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.swt.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.swt}" /> + </jar> + </target> + <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase"> <!--os specific gldesktop--> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.jar}" filesonly="true"> @@ -1555,11 +1570,11 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.gldesktop}" - excludes="${java.part.awt} ${java.part.util.awt}"/> + excludes="${java.part.awt} ${java.part.util.awt} ${java.part.swt}"/> </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase"> + <target name="build-jars-javase" depends="setup-manifestfile, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase, build-jars-swt-javase"> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" |