diff options
| -rwxr-xr-x | make/scripts/make.joal.all.android-armv6-cross.sh | 20 | ||||
| -rw-r--r-- | www/index.html | 17 | ||||
| -rw-r--r-- | www/test.zip | bin | 109250 -> 0 bytes |
3 files changed, 20 insertions, 17 deletions
diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh index 91821b4..ffc8786 100755 --- a/make/scripts/make.joal.all.android-armv6-cross.sh +++ b/make/scripts/make.joal.all.android-armv6-cross.sh @@ -16,7 +16,7 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -echo ANDROID_SDK_HOME $ANDROID_SDK_HOME +echo ANDROID_HOME $ANDROID_HOME echo NDK_ROOT $NDK_ROOT if [ -z "$NDK_ROOT" ] ; then @@ -48,22 +48,22 @@ elif [ ! -e $NDK_ROOT ] ; then fi export NDK_ROOT -if [ -z "$ANDROID_SDK_HOME" ] ; then +if [ -z "$ANDROID_HOME" ] ; then if [ -e /usr/local/android-sdk-linux_x86 ] ; then - ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86 + ANDROID_HOME=/usr/local/android-sdk-linux_x86 elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then - ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 elif [ -e /opt/android-sdk-linux_x86 ] ; then - ANDROID_SDK_HOME=/opt/android-sdk-linux_x86 + ANDROID_HOME=/opt/android-sdk-linux_x86 else - echo ANDROID_SDK_HOME is not specified and does not exist in default locations + echo ANDROID_HOME is not specified and does not exist in default locations exit 1 fi -elif [ ! -e $ANDROID_SDK_HOME ] ; then - echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist +elif [ ! -e $ANDROID_HOME ] ; then + echo ANDROID_HOME $ANDROID_HOME does not exist exit 1 fi -export ANDROID_SDK_HOME +export ANDROID_HOME export ANDROID_VERSION=9 export SOURCE_LEVEL=1.6 @@ -78,7 +78,7 @@ 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_SDK_HOME/platform-tools:$PATH" +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH" export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml diff --git a/www/index.html b/www/index.html index a978aa8..a718931 100644 --- a/www/index.html +++ b/www/index.html @@ -9,19 +9,17 @@ <div id="container"> <div id="header"> <div id="slogan"><img src="../../images/jogamp_symbols/website_final_sideslogan_joal_404x20pel.png" alt="Java™ Binding for the OpenAL® API"/></div> - <div id="logo"><a href="http://jogamp.org/"><img src="../../images/jogamp_symbols/website_final_blue_joal_346x70pel.png" alt="JOAL Symbol"/></a></div> + <div id="logo"><a href="http://jogamp.org/"><img src="../../images/jogamp_symbols/website_final_blue_joal_346x70pel.png" alt="JOAL Symbol"/></a><a href="http://www.openal.org"><img src="openal_c.gif"></a></div> </div> <div id="menu"> <ul> <li><a href="http://jogamp.org/">Home</a></li> - <li><a href="../../gluegen/www">Gluegen</a></li> - <li><a href="../../jocl/www">JOCL</a></li> - <li><a href="../../jogl/www">JOGL</a></li> <li><a href="../../joal-demos/www">Demos</a></li> + <li><a href="../../jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li> + <li><a href="../../gluegen/www">Gluegen</a></li> <li><a href="../../wiki/index.php/Jogl_FAQ">Wiki</a></li> <li><a href="../../blog/">Blogs</a></li> <li><a href="../../forum.html">Forums</a></li> - <li><a href="http://jogamp.org/deployment/jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li> </ul> </div> <div id="main"> @@ -31,9 +29,10 @@ <li><a href="http://www.openal.org">OpenAL Home</a></li> <li><a href="http://connect.creativelabs.com/openal/Documentation/OpenAL%201.1%20Specification.pdf">OpenAL Specification</a></li> <li><a href="http://connect.creativelabs.com/openal/Documentation/OpenAL_Programmers_Guide.pdf">OpenAL Programmer's Guide</a></li> - <li><a href="http://jogamp.org/joal-demos/www/">JOAL Tutorials and Demos</a></li> + <li><a href="http://kcat.strangesoft.net/openal.html">OpenAL-Soft</a></li> + <li><a href="../../joal-demos/www/">JOAL Tutorials and Demos</a></li> <li><a href="http://forum.jogamp.org/joal-f951297.html">JOAL Forums</a></li> - <li><a href="http://jogamp.org/deployment/jogamp-next/javadoc/joal/javadoc/">JOAL / Sound3D JavaDoc</a></li> + <li><a href="../../jogamp-next/javadoc/joal/javadoc/">JOAL / Sound3D JavaDoc</a></li> </ul> </div> <div id="text"> @@ -51,6 +50,10 @@ of OpenAL through an intuitive, easy to use, object-oriented interface. </p> + <h3>OpenAL-Soft</h3> + <p> + JOAL is tested using <a href="http://kcat.strangesoft.net/openal.html">OpenAL-Soft</a> the cross-platform, software implementation of the OpenAL 3D audio API. + </p> </div> </div> <div id="footer"> diff --git a/www/test.zip b/www/test.zip Binary files differdeleted file mode 100644 index 567a8c8..0000000 --- a/www/test.zip +++ /dev/null |