From 96d94d6217489b5fa22e4e64b2b7b94538b6d1dc Mon Sep 17 00:00:00 2001 From: nastys <7950891+nastys@users.noreply.github.com> Date: Fri, 4 Aug 2023 23:06:26 +0200 Subject: [PATCH] macOS CI: use faudio from submodule --- .ci/build-mac.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index eac07f67c02d..0a945405376f 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -6,8 +6,7 @@ brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv #/usr/sbin/softwareupdate --install-rosetta --agree-to-license arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" arch -x86_64 /usr/local/bin/brew update -arch -x86_64 /usr/local/bin/brew install -f --overwrite llvm@16 sdl2 glew cmake vulkan-headers ffmpeg -arch -x86_64 /usr/local/bin/brew install -f --overwrite --build-from-source faudio +arch -x86_64 /usr/local/bin/brew install -f --overwrite llvm@16 glew cmake sdl2 vulkan-headers ffmpeg arch -x86_64 /usr/local/bin/brew link -f llvm@16 # moltenvk based on commit for 1.2.4 release @@ -61,7 +60,7 @@ export LLVM_DIR LLVM_DIR="BREW_X64_PATH/opt/llvm@16" # exclude FAudio, SPIRV and LLVM, and sdl from submodule update # shellcheck disable=SC2046 -git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/FAudio/ && !/llvm/ && !/SPIRV/ && !/SDL/ { print $3 }' .gitmodules) +git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ && !/SPIRV/ && !/SDL/ { print $3 }' .gitmodules) # 3rdparty fixes sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c @@ -88,7 +87,7 @@ mkdir build && cd build || exit 1 -DLLVM_ENABLE_Z3_SOLVER=OFF \ -DUSE_NATIVE_INSTRUCTIONS=OFF \ -DUSE_SYSTEM_MVK=ON \ - -DUSE_SYSTEM_FAUDIO=ON \ + -DUSE_SYSTEM_FAUDIO=OFF \ -DUSE_SYSTEM_SDL=ON \ $CMAKE_EXTRA_OPTS \ -DLLVM_TARGET_ARCH=X86_64 \