summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-06-10 19:18:05 +0200
committerSven Gothel <[email protected]>2014-06-10 19:18:05 +0200
commit58b08142d0068354a4863f054b5a6ff723ca3df9 (patch)
tree73e658200673ad06016c24fa5e62d829b82b5130 /make/build.xml
parentb6b47a4c648871e2ca308b92d4a8f945a27f513b (diff)
Bump openal-soft: CMake: Don't use CMAKE_TOOLCHAIN_FILE for non-crosscompilation, use OPENAL_CUSTOM_CONFIG to inject cmake commands
Diffstat (limited to 'make/build.xml')
-rwxr-xr-xmake/build.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml
index fc6147b..1a78f96 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -541,7 +541,7 @@
<mkdir dir="${build}/openal-soft" />
<exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="../../openal-soft"/>
- <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.clang-x86_32.cmake"/>
+ <arg value="-DOPENAL_CUSTOM_CONFIG=../openal-soft/cmake/customconfig.clang-x86_32.cmake"/>
</exec>
<exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
</target>
@@ -551,7 +551,7 @@
<mkdir dir="${build}/openal-soft" />
<exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="../../openal-soft"/>
- <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.clang-default.cmake"/>
+ <arg value="-DOPENAL_CUSTOM_CONFIG=../openal-soft/cmake/customconfig.clang-default.cmake"/>
</exec>
<exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
</target>
@@ -561,7 +561,7 @@
<mkdir dir="${build}/openal-soft" />
<exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="../../openal-soft"/>
- <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-x86_32.cmake"/>
+ <arg value="-DOPENAL_CUSTOM_CONFIG=../openal-soft/cmake/customconfig.gcc-x86_32.cmake"/>
</exec>
<exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
</target>
@@ -571,7 +571,7 @@
<mkdir dir="${build}/openal-soft" />
<exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="../../openal-soft"/>
- <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-default.cmake"/>
+ <arg value="-DOPENAL_CUSTOM_CONFIG=../openal-soft/cmake/customconfig.gcc-default.cmake"/>
</exec>
<exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
</target>