diff options
| -rwxr-xr-x | make/build.xml | 13 | ||||
| -rw-r--r-- | www/index.html | 8 |
2 files changed, 16 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index f6fda25..51c92d5 100755 --- a/make/build.xml +++ b/make/build.xml @@ -378,7 +378,7 @@ </sequential> </macrodef> - <target name="c.build.joal" depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler"> + <target name="c.build.joal" depends="init, c.build.openal.soft, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler"> <echo message="compiler.cfg.id.base: ${compiler.cfg.id.base}"/> <echo message="linker.cfg.id.base: ${linker.cfg.id.base}"/> <c.build compiler.cfg.id="${compiler.cfg.id.base}" @@ -393,9 +393,20 @@ <fileset dir="lib/${os.and.arch}" erroronmissingdir="false"> <include name="*.${native.library.suffix}" /> </fileset> + <fileset dir="${build}/openal-soft" erroronmissingdir="false"> + <include name="*.${native.library.suffix}" /> + </fileset> </jar> </target> + <target name="c.build.openal.soft" depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler"> + <mkdir dir="${build}/openal-soft" /> + <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> + <arg value="../../../openal-soft"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + <!-- ================================================================== --> <!-- - Build the joal.jar file. diff --git a/www/index.html b/www/index.html index 5f9fede..a978aa8 100644 --- a/www/index.html +++ b/www/index.html @@ -21,7 +21,7 @@ <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://download.java.net/media/joal/builds/nightly/javadoc_public/">JavaDoc</a></li> + <li><a href="http://jogamp.org/deployment/jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li> </ul> </div> <div id="main"> @@ -31,9 +31,9 @@ <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://joal-demos.dev.java.net">JOAL Tutorials and Demos</a></li> - <li><a href="http://www.javagaming.org/index.php/board,26.0.html">JOAL Forums</a></li> - <li><a href="http://download.java.net/media/joal/builds/nightly/javadoc_public/">JOAL / Sound3D JavaDoc</a></li> + <li><a href="http://jogamp.org/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> </ul> </div> <div id="text"> |