Jenkins: Use submitted FAudio port on macOS
This commit is contained in:
@@ -520,9 +520,6 @@ then
|
||||
|
||||
# Point CMake to the toolchain file.
|
||||
[ -e "cmake/$toolchain.cmake" ] && cmake_flags_extra="$cmake_flags_extra -D \"CMAKE_TOOLCHAIN_FILE=cmake/$toolchain.cmake\""
|
||||
|
||||
# Use OpenAL as MacPorts doesn't package FAudio.
|
||||
cmake_flags_extra="$cmake_flags_extra -D OPENAL=ON"
|
||||
else
|
||||
# Determine Debian architecture.
|
||||
case $arch in
|
||||
|
@@ -4,7 +4,7 @@ ninja
|
||||
freetype
|
||||
libsdl2
|
||||
libpng
|
||||
openal-soft
|
||||
FAudio
|
||||
rtmidi
|
||||
qt5
|
||||
wget
|
||||
|
@@ -49,6 +49,7 @@ else()
|
||||
# Use FAudio, a reimplementation of XAudio2
|
||||
pkg_check_modules(FAUDIO IMPORTED_TARGET FAudio)
|
||||
if(FAUDIO_FOUND)
|
||||
include_directories(${FAUDIO_INCLUDE_DIRS})
|
||||
target_link_libraries(86Box PkgConfig::FAUDIO)
|
||||
else()
|
||||
find_path(FAUDIO_INCLUDE_DIR NAMES "FAudio.h")
|
||||
|
Reference in New Issue
Block a user