diff options
| -rw-r--r-- | make/build-jogl.xml | 4 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 6 | ||||
| -rw-r--r-- | make/build-newt.xml | 6 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-armv7-cross.sh | 5 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-armv7.sh | 15 |
5 files changed, 12 insertions, 24 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 6586022e1..9747c67cf 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1093,8 +1093,8 @@ </linker> <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="X11"/> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris"> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 8428dd88d..2353fd3d8 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -379,9 +379,9 @@ </linker> <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="X11"/> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" /> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xinerama"/> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" /> </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 5c12965d6..b0600db10 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -263,9 +263,9 @@ </linker> <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="X11"/> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xrandr"/> - <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh index 2828d357b..bbde79949 100755 --- a/make/scripts/make.jogl.all.linux-armv7-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh @@ -1,6 +1,6 @@ #! /bin/sh -PATH=`pwd`/../../gluegen/make/lib/linux-x86_64/arm-linux-gnueabi/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true @@ -19,6 +19,9 @@ export TARGET_IP=beagle01 export TARGET_ROOT=/home/jogamp/projects-cross export TARGET_ANT_HOME=/usr/share/ant +export TARGET_PLATFORM_LIBS=/opt-linux-armv7-eabi/lib +export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm + ant \ -Drootrel.build=build-linux-armv7 \ -Dgluegen.cpptasks.detected.os=true \ diff --git a/make/scripts/make.jogl.all.linux-armv7.sh b/make/scripts/make.jogl.all.linux-armv7.sh deleted file mode 100755 index fd4e95b30..000000000 --- a/make/scripts/make.jogl.all.linux-armv7.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxX86=true \ -# -DisX11=true \ - -ant \ - -Drootrel.build=build-linux-armv7 \ - -DuseKD=true \ - -DuseOpenMAX=true \ - -DuseBroadcomEGL=true \ - $* 2>&1 | tee make.jogl.all.linux-armv7.log |