Make building cubeb optional

2018-08-07 13:21:56 +02:00
2 changed files with 2 additions and 3 deletions
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -4,8 +4,6 @@ add_library(audio_core STATIC
    audio_renderer.cpp
    audio_renderer.h
    buffer.h
-    cubeb_sink.cpp
-    cubeb_sink.h
    codec.cpp
    codec.h
    null_sink.h
@@ -15,6 +13,8 @@ add_library(audio_core STATIC
    sink_details.cpp
    sink_details.h
    sink_stream.h
+
+    $<$<BOOL:${ENABLE_CUBEB}>:cubeb_sink.cpp cubeb_sink.h>
 )

 create_target_directory_groups(audio_core)
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -337,7 +337,6 @@ public:
             "AcquireNpadStyleSetUpdateEventHandle"},
            {107, nullptr, "DisconnectNpad"},
            {108, &Hid::GetPlayerLedPattern, "GetPlayerLedPattern"},
-            {109, nullptr, "ActivateNpadWithRevision"},
            {120, &Hid::SetNpadJoyHoldType, "SetNpadJoyHoldType"},
            {121, &Hid::GetNpadJoyHoldType, "GetNpadJoyHoldType"},
            {122, &Hid::SetNpadJoyAssignmentModeSingleByDefault,