Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/CMakeLists.txt
Vendored
+7 -2
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)
if (USE_SYSTEM_FAUDIO)
find_package(FAudio)
set(FAUDIO_TARGET FAudio)
else()
# FAudio depends on SDL2 # FAudio depends on SDL2
find_package(SDL2) find_package(SDL2)
if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9) if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9)
message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.") message(FATAL_ERROR "-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
else() 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)
rpcs3/Emu/Audio/FAudio/FAudioBackend.h
+1 -1
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
{ {