diff options
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index ec7a8a789..d0dfdcf32 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -114,6 +114,9 @@ <property name="java.part.swt" value="com/jogamp/newt/swt/** jogamp/newt/swt/**"/> + <property name="java.part.javafx" + value="com/jogamp/newt/javafx/** jogamp/newt/javafx/**"/> + <property name="java.part.applet3" value="com/jogamp/newt/util/applet3/**"/> @@ -156,6 +159,11 @@ <isset property="setup.noSWT"/> </condition> + <condition property="java.excludes.javafx" + value="${java.part.javafx}"> + <isset property="setup.noJFX"/> + </condition> + <condition property="java.excludes.applet3" value="${java.part.applet3}"> <not> @@ -167,7 +175,7 @@ <isset property="setup.noOpenGL"/> </condition> - <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.applet3}, ${java.excludes.opengl}" /> + <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.javafx}, ${java.excludes.applet3}, ${java.excludes.opengl}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> @@ -294,6 +302,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> </linker> <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64"> @@ -301,6 +310,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> </linker> <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> @@ -321,6 +331,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> <!--syslibset libs="xcb" /--> <!--syslibset libs="X11-xcb" /--> </linker> @@ -329,6 +340,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> <!--syslibset libs="xcb" /--> <!--syslibset libs="X11-xcb" /--> </linker> @@ -337,30 +349,34 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> <!--syslibset libs="xcb" /--> <!--syslibset libs="X11-xcb" /--> </linker> <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xrandr" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xcursor" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xi" /> </linker> <linker id="linker.cfg.linux.aarch64.newt.x11" extends="linker.cfg.linux.aarch64"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xrandr" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xcursor" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xi" /> </linker> <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" /> + <syslibset dir="${TARGET_PLATFORM_SYSROOT}/usr/lib" libs="android" /> </linker> <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> </linker> <linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9"> @@ -368,6 +384,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> </linker> <linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64"> @@ -375,6 +392,7 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xcursor"/> + <syslibset libs="Xi"/> </linker> <linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw"> @@ -602,10 +620,6 @@ <move file="${src}" tofile="${dest}" /> </target> - <target name="rename.dylib" if="isOSX"> - <move file="${src}" tofile="${dest}" /> - </target> - <macrodef name="c.build"> <attribute name="c.compiler.src.files" /> <attribute name="compiler.cfg.id" /> @@ -654,7 +668,7 @@ <targetfiles> <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -699,14 +713,7 @@ </cc> <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> - <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${obj.newt}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" /> - </antcall> - - <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> + suffix or at least understand the override from so to dll --> <antcall target="rename.mingw.dll" inheritRefs="true"> <param name="src" value="${obj.newt}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" /> @@ -806,6 +813,13 @@ </jar> </target> + <target name="build-jars-javafx" depends="setup-manifestfile" unless="setup.noJFX"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-javafx.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.javafx}"/> + </jar> + </target> + <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL"> <jar manifest="${build.newt}/manifest.mf" destfile="${newt-ogl.jar}" filesonly="true"> <fileset dir="${classes}" @@ -848,7 +862,7 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-swt,build-jars-driver"> + <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}"/> |