mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-22 23:30:14 +00:00
Fix macOS build process and make shell scripts cross-platform
- Add vulkan-loader, vulkan-headers, shaderc to macOS CI brew install - Add vulkan-loader and shaderc to macOS PKG_CONFIG_PATH - Replace Linux-only `nproc` with portable fallback in build.sh, rebuild.sh, extract_assets.sh, and tools/backup_assets.sh - Replace `ldconfig` StormLib check with portable detection (ldconfig, pkg-config, brew lib) in extract_assets.sh - Update BUILD_INSTRUCTIONS.md macOS section with vulkan/shaderc packages and MoltenVK explanation - Add macOS prerequisites to README.md
This commit is contained in:
parent
eb549a9b7a
commit
f66b9eb154
7 changed files with 42 additions and 13 deletions
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
|
|
@ -89,14 +89,14 @@ jobs:
|
|||
- name: Install dependencies
|
||||
run: |
|
||||
brew install cmake pkg-config sdl2 glew glm openssl@3 zlib ffmpeg unicorn \
|
||||
stormlib dylibbundler || true
|
||||
stormlib vulkan-loader vulkan-headers shaderc dylibbundler || true
|
||||
# dylibbundler may not be in all brew mirrors; install separately to not block others
|
||||
brew install dylibbundler 2>/dev/null || true
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
BREW=$(brew --prefix)
|
||||
export PKG_CONFIG_PATH="$BREW/lib/pkgconfig:$(brew --prefix ffmpeg)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig"
|
||||
export PKG_CONFIG_PATH="$BREW/lib/pkgconfig:$(brew --prefix ffmpeg)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig:$(brew --prefix vulkan-loader)/lib/pkgconfig:$(brew --prefix shaderc)/lib/pkgconfig"
|
||||
cmake -S . -B build \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="$BREW" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue