archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 307d93ef86 into 5569c5c803

Browse source
This commit is contained in:
Takuya Wakazono 2025-06-15 12:34:39 -03:00 • committed by GitHub
commit 28de2b3637
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -22,6 +22,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
endif() endif()
endif() endif()
if(APPLE OR WIN32)
set(USE_SYSTEM_OPENAL_DEFAULT OFF)
else()
set(USE_SYSTEM_OPENAL_DEFAULT ON)
endif()
option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON) option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON)
option(WITH_LLVM "Enable usage of LLVM library" ON) option(WITH_LLVM "Enable usage of LLVM library" ON)
option(BUILD_LLVM "Build LLVM from git submodule" OFF) option(BUILD_LLVM "Build LLVM from git submodule" OFF)
@ -35,7 +41,7 @@ option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
option(USE_SDL "Enables SDL input handler" OFF) option(USE_SDL "Enables SDL input handler" OFF)
option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON) option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON)
option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ${USE_SYSTEM_OPENAL_DEFAULT})
option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON) option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON) option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON)
option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF) option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF)

2
rpcs3/Emu/Cell/Modules/cellMic.cpp
View file

@ -11,7 +11,7 @@
#include <cmath> #include <cmath>
#ifndef WITHOUT_OPENAL #ifndef WITHOUT_OPENAL
#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" #include "alext.h"
#endif #endif
LOG_CHANNEL(cellMic); LOG_CHANNEL(cellMic);

3
rpcs3/Emu/Cell/Modules/cellMic.h
View file

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include "alc.h"
// Error Codes // Error Codes
enum CellMicInError : u32 enum CellMicInError : u32
{ {

4
rpcs3/rpcs3qt/microphone_creator.cpp
View file

@ -3,8 +3,8 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "3rdparty/OpenAL/openal-soft/include/AL/al.h" #include "al.h"
#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h" #include "alc.h"
LOG_CHANNEL(cfg_log, "CFG"); LOG_CHANNEL(cfg_log, "CFG");