diff options
| author | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
|---|---|---|
| committer | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
| commit | 9fce91044649c9f97bd94c5791a10270afad7570 (patch) | |
| tree | a69fa244ddeb78e52248d4306a4ecc6b27e924da /make/scripts/make.jogl.all.android-armv6-cross.sh | |
| parent | 5116d72f0150bdd6353ee664ef76e414bd61f87e (diff) | |
| parent | bfb10d309d97c19a33f9b6758f647186f8e0ddd6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'make/scripts/make.jogl.all.android-armv6-cross.sh')
| -rwxr-xr-x | make/scripts/make.jogl.all.android-armv6-cross.sh | 9 |
1 files changed, 8 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 da1b95c78..2b8f9a30e 100755 --- a/make/scripts/make.jogl.all.android-armv6-cross.sh +++ b/make/scripts/make.jogl.all.android-armv6-cross.sh @@ -1,5 +1,9 @@ #! /bin/sh +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +fi + export NODE_LABEL=. export HOST_UID=jogamp @@ -79,13 +83,16 @@ export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/p export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm # Need to add toolchain bins to the PATH. -export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH" +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/17.0.0:$PATH" 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" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + # BUILD_ARCHIVE=true \ ant \ -Drootrel.build=build-android-armv6 \ |