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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2022-04-07 15:48:50 -03:00
parent 4338882df4 6ac35ffe43
commit fe026fa49e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.ci/build.sh
View File

@@ -330,15 +330,20 @@ then
# macOS lacks nproc, but sysctl can do the same job.
alias nproc='sysctl -n hw.logicalcpu'
# Locate the MacPorts prefix.
macports="/opt/local"
[ -e "/opt/$arch/bin/port" ] && macports="/opt/$arch"
[ "$arch" = "x86_64" -a -e "/opt/intel/bin/port" ] && macports="/opt/intel"
# Install dependencies.
echo [-] Installing dependencies through MacPorts
sudo port selfupdate
sudo port install $(cat .ci/dependencies_macports.txt)
sudo $macports/bin/port selfupdate
sudo $macports/bin/port install $(cat .ci/dependencies_macports.txt)
# 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.
# Use OpenAL as MacPorts doesn't package FAudio.
cmake_flags_extra="$cmake_flags_extra -D OPENAL=ON"
else
# Determine Debian architecture.