Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-13 20:37:09 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-13 20:37:09 +0300
commit2d4a4fa0c1b617a8d68299c6d4501306867d51fa (patch)
treea109ae3a33cbce162fee201289ea5faa29414759 /build_files
parent18a9e0776c2e9400449a43f28707cc3e62b0c160 (diff)
parent6eeac735f2425ce4dffaee747b7e8823a793e464 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/openal.cmake31
1 files changed, 22 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake
index 3cd3a0aac72..7a693b1fce2 100644
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -18,18 +18,31 @@
if(BUILD_MODE STREQUAL Release)
set(OPENAL_EXTRA_ARGS
- -DALSOFT_UTILS=Off
- -DALSOFT_NO_CONFIG_UTIL=On
- -DALSOFT_EXAMPLES=Off
- -DALSOFT_TESTS=Off
- -DALSOFT_CONFIG=Off
- -DALSOFT_HRTF_DEFS=Off
- -DALSOFT_INSTALL=On
- -DALSOFT_BACKEND_SNDIO=Off
+ -DALSOFT_UTILS=OFF
+ -DALSOFT_NO_CONFIG_UTIL=ON
+ -DALSOFT_EXAMPLES=OFF
+ -DALSOFT_TESTS=OFF
+ -DALSOFT_CONFIG=OFF
+ -DALSOFT_HRTF_DEFS=OFF
+ -DALSOFT_INSTALL=ON
+ -DALSOFT_BACKEND_SNDIO=OFF
)
if(UNIX)
- set(OPENAL_EXTRA_ARGS ${OPENAL_EXTRA_ARGS} -DLIBTYPE=STATIC)
+ set(OPENAL_EXTRA_ARGS
+ ${OPENAL_EXTRA_ARGS}
+ -DLIBTYPE=STATIC
+ )
+ endif()
+
+ if(UNIX AND NOT APPLE)
+ # Ensure we have backends for playback.
+ set(OPENAL_EXTRA_ARGS
+ ${OPENAL_EXTRA_ARGS}
+ -DALSOFT_REQUIRE_ALSA=ON
+ -DALSOFT_REQUIRE_OSS=ON
+ -DALSOFT_REQUIRE_PULSEAUDIO=ON
+ )
endif()
ExternalProject_Add(external_openal