diff options
| author | Sven Gothel <[email protected]> | 2014-01-26 02:59:12 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-01-26 02:59:12 +0100 |
| commit | 87135467c4f292f7e43bc3957784b0e43769c9cc (patch) | |
| tree | 949a4737151f3690bf8448422a45ebc1ae1546bc /make/scripts | |
| parent | b6150bbc67a207669a2e820dd5b08e7e75b24200 (diff) | |
Script: Correct joal.jar path; Remove redundant NewtDebugActivity (Debug is on for NewtVersionActivity)
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.jogl.all.android-armv6-cross.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/make/scripts/make.jogl.all.android-armv6-cross.sh b/make/scripts/make.jogl.all.android-armv6-cross.sh index 2b8f9a30e..1b5f5bf44 100755 --- a/make/scripts/make.jogl.all.android-armv6-cross.sh +++ b/make/scripts/make.jogl.all.android-armv6-cross.sh @@ -1,5 +1,7 @@ #! /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 diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index 186da5505..dc121a596 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -73,7 +73,7 @@ if [ ! -e "$JOAL_BUILDDIR" ] ; then print_usage exit fi -JOAL_JAR="$JOAL_BUILDDIR"/joal.jar +JOAL_JAR="$JOAL_BUILDDIR"/jar/joal.jar if [ -z "$ANT_PATH" ] ; then ANT_PATH=$(dirname $(dirname $(which ant))) |