summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-03 01:59:09 +0100
committerSven Gothel <[email protected]>2012-03-03 01:59:09 +0100
commit7e8ff7c755b5b4bc9e63c08ab161598a99cad38a (patch)
treeb577421dc482d929e335669bf99eeaf72ebfcb15
parent7cd012c823e831279d7cf8f1f427846d1aad6af3 (diff)
Fix local armel path
-rwxr-xr-xmake/scripts/make.gluegen.all.linux-armv7-cross.sh5
-rwxr-xr-xmake/scripts/make.gluegen.all.linux-armv7.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index 152c247..a9892e1 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -6,6 +6,7 @@ if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
. $SDIR/setenv-build-jogl-x86_64.sh
fi
+# arm-linux-gnueabi == armel triplet
PATH=`pwd`/lib/linux/arm-linux-gnueabi/bin:$PATH
export PATH
@@ -27,8 +28,8 @@ export TARGET_IP=panda01
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
+export TARGET_PLATFORM_LIBS=/opt-linux-armv7-armel/usr/lib
+export TARGET_JAVA_LIBS=/opt-linux-armv7-armel/jre/lib/arm
export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml"
diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh
index ecc2d77..ee7cbea 100755
--- a/make/scripts/make.gluegen.all.linux-armv7.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7.sh
@@ -7,6 +7,7 @@
# -DisLinuxX86=true \
# -DisX11=true \
+# arm-linux-gnueabi == armel triplet
export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi
export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm