80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Use submitted FAudio port on macOS

Browse Source
This commit is contained in:
RichardG867
2022-05-03 20:49:55 -03:00
parent 50d23fcc59
commit ba2edf535e
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/build.sh
View File

@@ -520,9 +520,6 @@ then
# Point CMake to the toolchain file. # Point CMake to the toolchain file.
[ -e "cmake/$toolchain.cmake" ] && cmake_flags_extra="$cmake_flags_extra -D \"CMAKE_TOOLCHAIN_FILE=cmake/$toolchain.cmake\"" [ -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 else
# Determine Debian architecture. # Determine Debian architecture.
case $arch in case $arch in

2
.ci/dependencies_macports.txt
View File

@@ -4,7 +4,7 @@ ninja
freetype freetype
libsdl2 libsdl2
libpng libpng
openal-soft FAudio
rtmidi rtmidi
qt5 qt5
wget wget

1
src/sound/CMakeLists.txt
View File

@@ -49,6 +49,7 @@ else()
# Use FAudio, a reimplementation of XAudio2 # Use FAudio, a reimplementation of XAudio2
pkg_check_modules(FAUDIO IMPORTED_TARGET FAudio) pkg_check_modules(FAUDIO IMPORTED_TARGET FAudio)
if(FAUDIO_FOUND) if(FAUDIO_FOUND)
include_directories(${FAUDIO_INCLUDE_DIRS})
target_link_libraries(86Box PkgConfig::FAUDIO) target_link_libraries(86Box PkgConfig::FAUDIO)
else() else()
find_path(FAUDIO_INCLUDE_DIR NAMES "FAudio.h") find_path(FAUDIO_INCLUDE_DIR NAMES "FAudio.h")