summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rwxr-xr-xmake/scripts/make.jogl.all.android-armv6-cross.sh17
-rwxr-xr-xmake/scripts/make.jogl.all.android-armv7-cross.sh17
2 files changed, 18 insertions, 16 deletions
diff --git a/make/scripts/make.jogl.all.android-armv6-cross.sh b/make/scripts/make.jogl.all.android-armv6-cross.sh
index e75a73d45..da1b95c78 100755
--- a/make/scripts/make.jogl.all.android-armv6-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv6-cross.sh
@@ -30,14 +30,14 @@ if [ -z "$NDK_ROOT" ] ; then
elif [ -e /opt/android-ndk ] ; then
NDK_ROOT=/opt/android-ndk
#
- # Specific android-ndk-r7b
+ # Specific android-ndk-r8d
#
- elif [ -e /usr/local/android-ndk-r7b ] ; then
- NDK_ROOT=/usr/local/android-ndk-r7b
- elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then
- NDK_ROOT=/opt-linux-x86/android-ndk-r7b
- elif [ -e /opt/android-ndk-r7b ] ; then
- NDK_ROOT=/opt/android-ndk-r7b
+ elif [ -e /usr/local/android-ndk-r8d ] ; then
+ NDK_ROOT=/usr/local/android-ndk-r8d
+ elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then
+ NDK_ROOT=/opt-linux-x86/android-ndk-r8d
+ elif [ -e /opt/android-ndk-r8d ] ; then
+ NDK_ROOT=/opt/android-ndk-r8d
else
echo NDK_ROOT is not specified and does not exist in default locations
exit 1
@@ -70,7 +70,8 @@ export SOURCE_LEVEL=1.6
export TARGET_LEVEL=1.6
export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-export GCC_VERSION=4.4.3
+#export GCC_VERSION=4.4.3
+export GCC_VERSION=4.7
HOST_ARCH=linux-x86
export TARGET_TRIPLE=arm-linux-androideabi
diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh
index f38e05dea..f37abcdfd 100755
--- a/make/scripts/make.jogl.all.android-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv7-cross.sh
@@ -30,14 +30,14 @@ if [ -z "$NDK_ROOT" ] ; then
elif [ -e /opt/android-ndk ] ; then
NDK_ROOT=/opt/android-ndk
#
- # Specific android-ndk-r7b
+ # Specific android-ndk-r8d
#
- elif [ -e /usr/local/android-ndk-r7b ] ; then
- NDK_ROOT=/usr/local/android-ndk-r7b
- elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then
- NDK_ROOT=/opt-linux-x86/android-ndk-r7b
- elif [ -e /opt/android-ndk-r7b ] ; then
- NDK_ROOT=/opt/android-ndk-r7b
+ elif [ -e /usr/local/android-ndk-r8d ] ; then
+ NDK_ROOT=/usr/local/android-ndk-r8d
+ elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then
+ NDK_ROOT=/opt-linux-x86/android-ndk-r8d
+ elif [ -e /opt/android-ndk-r8d ] ; then
+ NDK_ROOT=/opt/android-ndk-r8d
else
echo NDK_ROOT is not specified and does not exist in default locations
exit 1
@@ -70,7 +70,8 @@ export SOURCE_LEVEL=1.6
export TARGET_LEVEL=1.6
export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-export GCC_VERSION=4.4.3
+#export GCC_VERSION=4.4.3
+export GCC_VERSION=4.7
HOST_ARCH=linux-x86
export TARGET_TRIPLE=arm-linux-androideabi