diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 76fc5a287..92a2bf9d0 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -67,7 +67,7 @@ <!-- partitioning --> <property name="java.part.core" - value="javax/media/nativewindow/* javax/media/nativewindow/util/* com/jogamp/nativewindow/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/> + value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/> <property name="java.part.awt" value="com/jogamp/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/> @@ -150,8 +150,8 @@ <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" /> <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${jogamp.version.base} Specification" /> - <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> - <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" /> + <property name="javadoc.overview" value="../src/nativewindow/classes/com/jogamp/nativewindow/package.html" /> + <property name="javadoc.spec.packagenames" value="com.jogamp.nativewindow.*" /> <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" /> @@ -344,6 +344,12 @@ <compilerarg value="/usr/include" /> </compiler> + <compiler id="compiler.cfg.linux.aarch64.nativewindow.x11" extends="compiler.cfg.linux.aarch64"> + <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> + <compilerarg value="-idirafter" /> + <compilerarg value="/usr/include" /> + </compiler> + <compiler id="compiler.cfg.solaris.nativewindow.x11" extends="compiler.cfg.solaris"> <compilerarg value="-I/usr/X11R6/include" /> </compiler> @@ -397,6 +403,12 @@ <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> </linker> + <linker id="linker.cfg.linux.aarch64.nativewindow.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="Xxf86vm" /> + <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> + </linker> + <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> <linkerarg value="-L/usr/sfw/lib"/> <syslibset libs="X11"/> @@ -485,6 +497,12 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" /> </target> + <target name="c.configure.linux.aarch64" if="isLinuxARM64"> + <echo message="Linux.aarch64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64.nativewindow.x11" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.aarch64.nativewindow.x11" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -527,7 +545,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> @@ -870,6 +888,7 @@ maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <arg value="${javadoc.xarg1}"/> </javadoc> </target> @@ -885,6 +904,7 @@ maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <arg value="${javadoc.xarg1}"/> </javadoc> </target> @@ -900,6 +920,7 @@ maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <arg value="${javadoc.xarg1}"/> </javadoc> </target> |