From c978c074db3c388bad1dcbe6327b36f190826656 Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:29:14 -0800 Subject: [PATCH] build: Update and re-enable cubeb on macOS. (#7405) --- CMakeLists.txt | 3 +-- externals/cubeb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaa5ca118..ceaac9a78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,8 +74,7 @@ CMAKE_DEPENDENT_OPTION(ENABLE_DEDICATED_ROOM "Enable generating dedicated room e option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) option(ENABLE_SCRIPTING "Enable RPC server for scripting" ON) -# TODO: cubeb currently causes issues on macOS, see: https://github.com/mozilla/cubeb/issues/771 -CMAKE_DEPENDENT_OPTION(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT APPLE" OFF) +CMAKE_DEPENDENT_OPTION(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT IOS" OFF) option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON) CMAKE_DEPENDENT_OPTION(ENABLE_LIBUSB "Enable libusb for GameCube Adapter support" ON "NOT IOS" OFF) diff --git a/externals/cubeb b/externals/cubeb index 48689ae7a..799e77548 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 48689ae7a73caeb747953f9ed664dc71d2f918d8 +Subproject commit 799e775484b8fce7e986ee7a4f4b651fec2bca07