Adapt to GlueGen ARM Build Changes 422d7a5eb53fca6642ebf4e8910d8b0311bb2597

3 files changed, 53 insertions, 8 deletions

diff --git a/make/scripts/make.joal.all.android-armv7-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh
index a79763d..91821b4 100755
--- a/make/scripts/make.joal.all.android-armv7-cross.sh
+++ b/make/scripts/make.joal.all.android-armv6-cross.sh
@@ -80,13 +80,13 @@ export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arc
 # Need to add toolchain bins to the PATH. 
 export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH"
 
-export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv7.xml
+export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml
 
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
 # BUILD_ARCHIVE=true \
 ant \
-    -Drootrel.build=build-android-armv7 \
-    $* 2>&1 | tee -a make.joal-armv7-cross.log
+    -Drootrel.build=build-android-armv6 \
+    $* 2>&1 | tee -a make.joal-armv6-cross.log
 
diff --git a/make/scripts/make.joal.all.linux-armv7-cross.sh b/make/scripts/make.joal.all.linux-armv6-cross.sh
index 64455b1..c499f12 100755
--- a/make/scripts/make.joal.all.linux-armv7-cross.sh
+++ b/make/scripts/make.joal.all.linux-armv6-cross.sh
@@ -28,17 +28,17 @@ 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-armv6-eabi/lib
+export TARGET_JAVA_LIBS=/opt-linux-armv6-eabi/jre/lib/arm
 
-export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv4.xml"
+export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml"
 
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
 ant \
-    -Drootrel.build=build-linux-armv7 \
-    $* 2>&1 | tee make.joal.all.linux-armv7-cross.log
+    -Drootrel.build=build-linux-armv6 \
+    $* 2>&1 | tee make.joal.all.linux-armv6-cross.log
 
 
 
diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh
new file mode 100755
index 0000000..78f1110
--- /dev/null
+++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
+export PATH
+
+#    -Dc.compiler.debug=true 
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxARMv7=true \
+#    -DisX11=false \
+
+export NODE_LABEL=.
+
+export HOST_UID=jogamp
+export HOST_IP=jogamp02
+export HOST_RSYNC_ROOT=PROJECTS/JOGL
+
+export TARGET_UID=jogamp
+export TARGET_IP=panda01
+#export TARGET_IP=jautab02
+export TARGET_ROOT=/home/jogamp/projects-cross
+export TARGET_ANT_HOME=/usr/share/ant
+
+export TARGET_PLATFORM_LIBS=/opt-linux-armv6-armhf/lib
+export TARGET_JAVA_LIBS=/opt-linux-armv6-armhf/jre/lib/arm
+
+export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml"
+
+#export JUNIT_DISABLED="true"
+#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+
+ant \
+    -Drootrel.build=build-linux-armv6hf \
+    $* 2>&1 | tee make.joal.all.linux-armv6hf-cross.log
+
+
+
+