From 35c43aa2932e4291ae29e0c0d30991dc8ddfd6f7 Mon Sep 17 00:00:00 2001 From: darkf Date: Fri, 25 May 2018 00:58:53 -0500 Subject: [PATCH] audio_core: Only include cubeb if it's available --- src/audio_core/CMakeLists.txt | 1 + src/audio_core/sink_details.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 6c0befab0..9f704c751 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -39,4 +39,5 @@ endif() if(ENABLE_CUBEB) target_link_libraries(audio_core PRIVATE cubeb) + add_definitions(-DHAVE_CUBEB=1) endif() \ No newline at end of file diff --git a/src/audio_core/sink_details.cpp b/src/audio_core/sink_details.cpp index b526ed953..a7e51e5f3 100644 --- a/src/audio_core/sink_details.cpp +++ b/src/audio_core/sink_details.cpp @@ -11,14 +11,18 @@ #ifdef HAVE_SDL2 #include "audio_core/sdl2_sink.h" #endif +#ifdef HAVE_CUBEB #include "audio_core/cubeb_sink.h" +#endif #include "common/logging/log.h" namespace AudioCore { // g_sink_details is ordered in terms of desirability, with the best choice at the top. const std::vector g_sink_details = { +#ifdef HAVE_CUBEB {"cubeb", []() { return std::make_unique(); }}, +#endif #ifdef HAVE_SDL2 {"sdl2", []() { return std::make_unique(); }}, #endif