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 | |
| parent | b6150bbc67a207669a2e820dd5b08e7e75b24200 (diff) | |
Script: Correct joal.jar path; Remove redundant NewtDebugActivity (Debug is on for NewtVersionActivity)
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-jogl.xml | 12 | ||||
| -rw-r--r-- | make/resources/android/res-jogl/values/strings.xml | 2 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.android-armv6-cross.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 2 |
4 files changed, 3 insertions, 15 deletions
diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml index d9a9ac819..1b6c46356 100644 --- a/make/resources/android/AndroidManifest-jogl.xml +++ b/make/resources/android/AndroidManifest-jogl.xml @@ -28,18 +28,6 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name="jogamp.newt.driver.android.NewtDebugActivityLauncher" - android:finishOnTaskLaunch="true" - android:launchMode="singleTop" - android:configChanges="keyboardHidden|orientation" - android:label="@string/activity_debug_name" - android:description="@string/activity_debug_descr" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> </application> </manifest> diff --git a/make/resources/android/res-jogl/values/strings.xml b/make/resources/android/res-jogl/values/strings.xml index ae4816665..e88a0a4e0 100644 --- a/make/resources/android/res-jogl/values/strings.xml +++ b/make/resources/android/res-jogl/values/strings.xml @@ -5,6 +5,4 @@ <string name="app_descr">Contains Dalvik and native code, supporting native bindings.</string> <string name="activity_version_name">Jogl\'s Version</string> <string name="activity_version_descr">Shows the version of the JOGL Library and runtime GL infos.</string> - <string name="activity_debug_name">Jogl Debug</string> - <string name="activity_debug_descr">Debug output of JOGL\'s initialization.</string> </resources> 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))) |