diff options
| author | Sven Gothel <[email protected]> | 2013-03-27 04:33:06 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-03-27 04:33:06 +0100 |
| commit | 3afb1c6b6643c44c8d984b642dceee0a7eb4f031 (patch) | |
| tree | f5666d7010243b58d3297e4deda12d59298b9df0 | |
| parent | 1eeccc001582f8529143af5198c32d59c944f629 (diff) | |
Inject precompiled soft-openal blobs in case native compilation fails. Currently impacts Windows, i.e. providing precompiled DLLs in native jar files.
| -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 e860500..40e72c0 100755 --- a/make/build.xml +++ b/make/build.xml @@ -502,11 +502,22 @@ <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> + <!-- If compilation is not supported or fails, at least we pick up the injected pre-compiled binaries, if available. --> + <target name="c.build.openal.use-blobs" unless="c.build.openal.soft.done"> + <copy todir="../${rootrel.build}/obj" failonerror="false"> + <fileset dir="lib/${os.and.arch}" erroronmissingdir="false"> + <include name="*openal.${native.library.suffix}" /> + <include name="*soft_oal.${native.library.suffix}" /> + </fileset> + </copy> + </target> + <target name="c.build.openal.soft" - depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.default"> + depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.default"> <copy todir="../${rootrel.build}/obj" failonerror="false"> <fileset dir="${build}/openal-soft" erroronmissingdir="false"> <include name="*openal.${native.library.suffix}" /> + <include name="*soft_oal.${native.library.suffix}" /> </fileset> </copy> </target> |