diff options
| author | Sven Gothel <[email protected]> | 2015-07-11 01:12:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-07-11 01:12:06 +0200 |
| commit | 5e2a1f0e55abd4f4ed6b5ed9cece08b0550a0076 (patch) | |
| tree | 35c3eb4f885ff04a3ed1ecd13d611f4b5ac7b77e /make/build.xml | |
| parent | 3182f64a8a900184d61f36966f20641791ca754e (diff) | |
cmake/clang: Inject additional architectures for fat-binary (macosx) ; Bump openal-soft to 178194b7de4b4ad1de0c701356fca46565dde762
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/make/build.xml b/make/build.xml index 6f28652..a6a240c 100755 --- a/make/build.xml +++ b/make/build.xml @@ -576,10 +576,26 @@ <target name="c.build.openal.soft.clang.default" if="isCLANG" unless="c.build.openal.soft.done"> <property name="c.build.openal.soft.done" value="true" /> + + <!-- add addition architectures for fat-binary, currently used by macosx only. --> + <var name="cmake.arch.ppc" unset="true"/> + <var name="cmake.arch.x32" unset="true"/> + <var name="cmake.arch.x64" unset="true"/> + <condition property="cmake.arch.ppc" value="-arch ppc" else=""> + <istrue value="${use.macosppc}" /> + </condition> + <condition property="cmake.arch.x32" value="-arch i386" else=""> + <istrue value="${use.macosx32}" /> + </condition> + <condition property="cmake.arch.x64" value="-arch x86_64" else=""> + <istrue value="${use.macosx64}" /> + </condition> + <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> <arg value="../../openal-soft"/> <arg value="-DOPENAL_CUSTOM_CONFIG=../openal-soft/cmake/customconfig.clang-default.cmake"/> + <arg value="-DCMAKE_EXTRA_ARCHS=${cmake.arch.ppc} ${cmake.arch.x32} ${cmake.arch.x64}"/> </exec> <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> |