diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-06-28 13:37:05 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-06-28 13:37:05 +0300 |
commit | 48360afb105299e80155fd994b8c06c6f5e917ff (patch) | |
tree | 71dc80cd23d30c118fdff75e633e411709ea5e6b /CMakeLists.txt | |
parent | 0493a328032891bc40e992e031a4a4b36aa2bead (diff) | |
parent | e684c170f9f8fb1aaeb7e59c9d1a14ba94b6791d (diff) |
Merge commit 'master@{3-months-ago}' into tmp-vulkan
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e39c5b561f..9ab3c80a793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,15 +300,33 @@ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.or # Sound output option(WITH_SDL "Enable SDL for sound and joystick support" ON) option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) +if(APPLE) + option(WITH_COREAUDIO "Enable CoreAudio for audio support on macOS" ON) +else() + set(WITH_COREAUDIO OFF) +endif() if(NOT WIN32) option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" ON) if(UNIX AND NOT APPLE) option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries loading" OFF) endif() +else() + set(WITH_JACK OFF) endif() if(UNIX AND NOT APPLE) option(WITH_SDL_DYNLOAD "Enable runtime dynamic SDL libraries loading" OFF) endif() +if(UNIX AND NOT APPLE) + option(WITH_PULSEAUDIO "Enable PulseAudio for audio support on Linux" ON) + option(WITH_PULSEAUDIO_DYNLOAD "Enable runtime dynamic PulseAudio libraries loading" OFF) +else() + set(WITH_PULSEAUDIO OFF) +endif() +if(WIN32) + option(WITH_WASAPI "Enable Windows Audio Sessions API for audio support on Windows" ON) +else() + set(WITH_WASAPI OFF) +endif() # Compression option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON) @@ -676,16 +694,11 @@ if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE) ) endif() -if(NOT WITH_AUDASPACE) - if(WITH_OPENAL) - message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled") - set(WITH_OPENAL OFF) - endif() - if(WITH_JACK) - message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled") - set(WITH_JACK OFF) - endif() -endif() +set_and_warn_dependency(WITH_AUDASPACE WITH_OPENAL OFF) +set_and_warn_dependency(WITH_AUDASPACE WITH_COREAUDIO OFF) +set_and_warn_dependency(WITH_AUDASPACE WITH_JACK OFF) +set_and_warn_dependency(WITH_AUDASPACE WITH_PULSEAUDIO OFF) +set_and_warn_dependency(WITH_AUDASPACE WITH_WASAPI OFF) if(NOT WITH_SDL AND WITH_GHOST_SDL) message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL") @@ -1957,11 +1970,15 @@ if(FIRST_RUN) info_cfg_option(WITH_CODEC_AVI) info_cfg_option(WITH_CODEC_FFMPEG) info_cfg_option(WITH_CODEC_SNDFILE) + info_cfg_option(WITH_COREAUDIO) info_cfg_option(WITH_JACK) info_cfg_option(WITH_JACK_DYNLOAD) info_cfg_option(WITH_OPENAL) + info_cfg_option(WITH_PULSEAUDIO) + info_cfg_option(WITH_PULSEAUDIO_DYNLOAD) info_cfg_option(WITH_SDL) info_cfg_option(WITH_SDL_DYNLOAD) + info_cfg_option(WITH_WASAPI) info_cfg_text("Compression:") info_cfg_option(WITH_LZMA) |