summaryrefslogtreecommitdiffstats
path: root/make/build-nativewindow.xml
diff options
context:
space:
mode:
authorEdwin Vane <[email protected]>2012-01-31 09:24:51 -0500
committerEdwin Vane <[email protected]>2012-02-28 16:13:45 -0500
commitfc779ca57ec338c3e4a2b8d0b3a2bac4277bc380 (patch)
treeb1fe85f6e03047f4479f30fddadfbb92b98b50fe /make/build-nativewindow.xml
parentb7407c39c0d3785f2fc21782d31c439622f0d744 (diff)
Get JOGL to build with NDK r7
- Most of the android build work is done by gluegen ant files. Changes made to gluegen in support of NDK r7 need to be reflected here: - New/fewer environment variables. - Specifying android.abi for packaging. - Cross-compilation script cleaned up to look like gluegen's cross compile script for consistency. - Renamed install/re-install adb helper scripts to be ARM specific.
Diffstat (limited to 'make/build-nativewindow.xml')
-rw-r--r--make/build-nativewindow.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index c66a92d09..c3a916804 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -400,9 +400,9 @@
</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="Xrender" />
+ <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">