diff -Nru jogl2-2.0-rc3/make/build-nativewindow.xml jogl2-2.0-rc3-gil/make/build-nativewindow.xml --- jogl2-2.0-rc3/make/build-nativewindow.xml 2011-12-05 15:46:23.365530531 +0100 +++ jogl2-2.0-rc3-gil/make/build-nativewindow.xml 2011-12-05 15:45:37.619531434 +0100 @@ -380,10 +380,10 @@ </linker> <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" /> + <syslibset libs="X11" /> + <syslibset libs="Xxf86vm" /> + <syslibset libs="Xinerama" /> + <syslibset libs="Xrender" /> </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> @@ -627,6 +627,7 @@ </patternset> <echo message="Compiling @{output.lib.name}" /> + <echo message="java.lib.dir.platform: ${java.lib.dir.platform}" /> <!-- have to wrap cc task with outofdate, because otherwise cc links a new library even when no files have been compiled --> @@ -666,7 +667,7 @@ <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> </compiler> - + <linker extends="@{linker.cfg.id}"> <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/> <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/> diff -Nru jogl2-2.0-rc3/make/build-newt.xml jogl2-2.0-rc3-gil/make/build-newt.xml --- jogl2-2.0-rc3/make/build-newt.xml 2011-10-06 15:52:37.000000000 +0200 +++ jogl2-2.0-rc3-gil/make/build-newt.xml 2011-12-05 15:45:37.620531434 +0100 @@ -274,9 +274,9 @@ </linker> <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> + <syslibset libs="X11" /> + <syslibset libs="Xrandr" /> + <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> @@ -367,13 +367,73 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> + <target name="c.configure.linux.hppa" if="isLinuxHppa"> + <echo message="Linux.hppa" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.mips" if="isLinuxMips"> + <echo message="Linux.mips" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.mipsel" if="isLinuxMipsel"> + <echo message="Linux.mips" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.ppc" if="isLinuxPpc"> + <echo message="Linux.ppc" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.s390" if="isLinuxs390"> + <echo message="Linux.S390" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.sparc" if="isLinuxSparc"> + <echo message="Linux.sparc" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> + <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,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.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.android" if="isAndroid"> <echo message="Android" />