From 751ac51af43894c0165bab48bb926d87738e6373 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Mon, 28 Jul 2025 14:02:06 -0400
Subject: [PATCH] [cmake] partial audio_core fix

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 CMakeLists.txt                                                 | 1 +
 src/audio_core/CMakeLists.txt                                  | 1 +
 src/audio_core/adsp/apps/opus/opus_decode_object.h             | 2 +-
 src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h | 2 +-
 src/audio_core/opus/hardware_opus.h                            | 2 +-
 src/core/CMakeLists.txt                                        | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d9ddb57ce..9837126695 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -411,6 +411,7 @@ find_package(stb MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
+find_package(Opus 1.3 MODULE)
 
 # if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
 #     find_package(VulkanHeaders 1.3.274 REQUIRED)
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index cf4bcab059..068b58d2c2 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -226,6 +226,7 @@ else()
     )
 endif()
 
+target_include_directories(audio_core PRIVATE ${OPUS_INCLUDE_DIRS})
 target_link_libraries(audio_core PUBLIC common core opus)
 
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
diff --git a/src/audio_core/adsp/apps/opus/opus_decode_object.h b/src/audio_core/adsp/apps/opus/opus_decode_object.h
index 8b821a0f75..6425f987c6 100644
--- a/src/audio_core/adsp/apps/opus/opus_decode_object.h
+++ b/src/audio_core/adsp/apps/opus/opus_decode_object.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <opus/opus.h>
+#include <opus.h>
 
 #include "common/common_types.h"
 
diff --git a/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h b/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h
index f66bedbde3..93558ded5d 100644
--- a/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h
+++ b/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <opus/opus_multistream.h>
+#include <opus_multistream.h>
 
 #include "common/common_types.h"
 
diff --git a/src/audio_core/opus/hardware_opus.h b/src/audio_core/opus/hardware_opus.h
index eb5cdf3449..caa7468401 100644
--- a/src/audio_core/opus/hardware_opus.h
+++ b/src/audio_core/opus/hardware_opus.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <mutex>
-#include <opus/opus.h>
+#include <opus.h>
 
 #include "audio_core/adsp/apps/opus/opus_decoder.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8e167c51d9..f0090a36b9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1184,6 +1184,7 @@ else()
     )
 endif()
 
+target_include_directories(core PRIVATE ${OPUS_INCLUDE_DIRS})
 target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz)
 target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
 if (MINGW)