From daad30b2b3969ebc1b7c0e5ff490ca93c3edcae3 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 5 May 2025 01:14:03 +0900 Subject: [PATCH] Fix USE_SYSTEM_OPENAL to use system headers Even when USE_SYSTEM_OPENAL was enabled, the code directly included the bundled OpenAL headers, bypassing the system headers. Since `#include ` is not portable, use `#include "al.h"` instead. https://cmake.org/cmake/help/latest/module/FindOpenAL.html --- rpcs3/Emu/Cell/Modules/cellMic.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMic.h | 3 ++- rpcs3/rpcs3qt/microphone_creator.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index a5ece1be59..0724b48927 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -11,7 +11,7 @@ #include #ifndef WITHOUT_OPENAL -#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" +#include "alext.h" #endif LOG_CHANNEL(cellMic); diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index e4b416fa6a..88a2f4d937 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -1,9 +1,10 @@ #pragma once #include "Utilities/Thread.h" -#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h" #include "Utilities/mutex.h" +#include "alc.h" + // Error Codes enum CellMicInError : u32 { diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp index 9ea04defde..2821fd82e4 100644 --- a/rpcs3/rpcs3qt/microphone_creator.cpp +++ b/rpcs3/rpcs3qt/microphone_creator.cpp @@ -3,8 +3,8 @@ #include "Utilities/StrUtil.h" -#include "3rdparty/OpenAL/openal-soft/include/AL/al.h" -#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h" +#include "al.h" +#include "alc.h" LOG_CHANNEL(cfg_log, "CFG");