diff options
| author | Sven Gothel <[email protected]> | 2019-04-08 06:02:28 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-08 06:02:28 +0200 |
| commit | 89e075c2d14afc8b7f7eb589d0d3b9285751209b (patch) | |
| tree | cfb994cbf1d5cb348b52a2840890a5c6a78570bf | |
| parent | 1ecfcebb0604abc42e70b986f6358fcf282f47c7 (diff) | |
Bug 1190: Adapt cross build TARGET_PLATFORM_USRLIBS and TARGET_PLATFORM_SYSROOT (android)
| -rw-r--r-- | make/build-jogl.xml | 4 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 12 | ||||
| -rw-r--r-- | make/build-newt.xml | 18 | ||||
| -rw-r--r-- | make/build-oculusvr.xml | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 9faeae458..1d867c56b 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1224,11 +1224,11 @@ </linker> <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11"/> </linker> <linker id="linker.cfg.linux.aarch64.jogl.x11" extends="linker.cfg.linux.aarch64"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11"/> </linker> <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 551f92ac8..d13ca09b8 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -404,15 +404,15 @@ </linker> <linker id="linker.cfg.linux.armv6.nativewindow.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="Xxf86vm" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xxf86vm" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" 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" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xxf86vm" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xrender" /> </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> diff --git a/make/build-newt.xml b/make/build-newt.xml index f5db296f8..d0dfdcf32 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -355,21 +355,21 @@ </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="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xi" /> + <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="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xi" /> + <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"> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index e66ec5b88..2fa7b16fa 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -633,7 +633,7 @@ <syslibset libs="ws2_32" if="isWindows"/> <syslibset libs="X11 Xrandr udev m" if="isLinux" unless="isLinuxARMv6" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11 Xrandr udev m" if="isLinuxARMv6" /> <syslibset dir="/usr/local/lib" libs="X11 Xrandr udev m" if="isFreeBSD"/> |