diff options
| author | Sven Gothel <[email protected]> | 2012-11-05 07:28:03 -0800 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-11-05 07:28:03 -0800 |
| commit | 5cf70309b054bca4317230af2e432576a20060c5 (patch) | |
| tree | 6dede1ba26a9d838ecb78cb4fe3d11222200d1ec /make | |
| parent | 232963f5e2069eaf339c0e8f61b192db8214853e (diff) | |
| parent | 2420f0e3352a46c8deb9c5827f78add65cb9d1a4 (diff) | |
Merge pull request #3 from xranby/openal-soft
Build and bundle a openal-soft fallback on all arch.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/build.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index f6fda25..f06f315 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"> + <arg value="../../../openal-soft"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" /> + </target> + <!-- ================================================================== --> <!-- - Build the joal.jar file. |