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

2020-02-19 08:17:43 -08:00
parent 583220b95a
commit 9d1833c5a8
3 changed files with 6 additions and 5 deletions
@@ -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=$?;

@@ -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()