diff --git a/.travis/build-linux.bash b/.travis/build-linux.bash index a68a64e284..c07a4bfd30 100644 --- a/.travis/build-linux.bash +++ b/.travis/build-linux.bash @@ -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=$?; diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 0ff99d723c..fc6a93940f 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -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() diff --git a/3rdparty/FAudio b/3rdparty/FAudio index f86adca2bd..9c7d2d1430 160000 --- a/3rdparty/FAudio +++ b/3rdparty/FAudio @@ -1 +1 @@ -Subproject commit f86adca2bdd87c62b5d0db89c9a4279d1c8adce9 +Subproject commit 9c7d2d1430c9dbe4e67c871dfe003b331f165412