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

Refactor faudio submodule (#10397)

Browse source 
* updated bad header import
* added faudio shared library option
This commit is contained in:
polar 2021-07-08 20:31:45 +01:00 • committed by GitHub
parent 770a607ba5
commit 285b9dad83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
3rdparty/CMakeLists.txt vendored
View file

@ -222,11 +222,16 @@ add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
# FAudio # FAudio
set(FAUDIO_TARGET 3rdparty_dummy_lib) set(FAUDIO_TARGET 3rdparty_dummy_lib)
if(USE_FAUDIO) if(USE_FAUDIO)
# FAudio depends on SDL2 if (USE_SYSTEM_FAUDIO)
find_package(SDL2) find_package(FAudio)
if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9) set(FAUDIO_TARGET FAudio)
message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
else() else()
# FAudio depends on SDL2
find_package(SDL2)
if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9)
message(FATAL_ERROR "-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
endif()
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library") set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
add_subdirectory(FAudio EXCLUDE_FROM_ALL) add_subdirectory(FAudio EXCLUDE_FROM_ALL)
target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO) target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)

2
rpcs3/Emu/Audio/FAudio/FAudioBackend.h
View file

@ -5,7 +5,7 @@
#endif #endif
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
#include "3rdparty/FAudio/include/FAudio.h" #include "FAudio.h"
class FAudioBackend : public AudioBackend class FAudioBackend : public AudioBackend
{ {