RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Bump FAudio depedency, set FAudio to build statically, enable FAudio in the build script

Browse Source
This commit is contained in:
Zion Nimchuk 2020-02-19 08:17:43 -08:00 committed by Ivan
parent 583220b95a
commit 9d1833c5a8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/build-linux.bash
View File

@ -26,7 +26,7 @@ else
export CXX=${CLANGXX_BINARY}
fi
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -DUSE_FAUDIO=OFF -G Ninja
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
ninja; build_status=$?;

7
3rdparty/CMakeLists.txt vendored
View File

@ -337,9 +337,10 @@ if(USE_FAUDIO)
if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9)
message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
else()
add_subdirectory(FAudio EXCLUDE_FROM_ALL)
target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)
set(FAUDIO_TARGET FAudio)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
add_subdirectory(FAudio EXCLUDE_FROM_ALL)
target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)
set(FAUDIO_TARGET FAudio)
endif()
endif()

2
3rdparty/FAudio vendored

@ -1 +1 @@
Subproject commit f86adca2bdd87c62b5d0db89c9a4279d1c8adce9
Subproject commit 9c7d2d1430c9dbe4e67c871dfe003b331f165412