diff options
| author | Sven Gothel <[email protected]> | 2014-01-26 02:14:26 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-01-26 02:14:26 +0100 |
| commit | aac4c5fc4ab7c77eff3b71f518100dd182ec2c33 (patch) | |
| tree | 3883e6e9a97146a0cbf503ff67f7b58870fe22dd /make/scripts/make.jocl.all.android-armv6-cross.sh | |
| parent | ac84afd26ad3b34851a423fb90e6c819b9dc9495 (diff) | |
Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android JoclVersionActivity
Cleanup Build:
- Move gluegen config files into make/config (cleanup)
- Move stub_includes into respective folder make/stub_includes
and keep resources 'clean'
JoclVersion:
- Analoge to JoglVersion, replaces JOCLVersion (deprecated for now)
- Added text based CL info dump.
JoclVersionActivity:
- Analog to JoclVersionActivity
- Added full launch .. tested on Android (but no OpenCL avail.)
Diffstat (limited to 'make/scripts/make.jocl.all.android-armv6-cross.sh')
| -rwxr-xr-x | make/scripts/make.jocl.all.android-armv6-cross.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/make/scripts/make.jocl.all.android-armv6-cross.sh b/make/scripts/make.jocl.all.android-armv6-cross.sh index 01c87a42..1d6a8396 100755 --- a/make/scripts/make.jocl.all.android-armv6-cross.sh +++ b/make/scripts/make.jocl.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 @@ -84,7 +86,7 @@ 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_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 GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" |