Skip to content

Commit

Permalink
Make sure Mac and Linux builds have SDL2 available.
Browse files Browse the repository at this point in the history
Currently Windows gets this from vcpkg. Mac will get it from Homebrew,
and the GitHub linux builders will just install it with apt-get.

This might not be the perfect solution (having to install Homebrew is a pain,
GitHub Actions has an ancient SDL2), but it gets all the common platforms
running for now without much fuss.
  • Loading branch information
icculus committed Apr 30, 2024
1 parent 913d82a commit ea32991
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
sudo apt update
sudo apt install -y --no-install-recommends \
ninja-build cmake g++ libgtest-dev libsdl1.2-dev libsdl-image1.2-dev libncurses-dev zlib1g-dev
ninja-build cmake g++ libgtest-dev libsdl2-dev libncurses-dev zlib1g-dev
- name: Configure CMake
env:
Expand Down
3 changes: 1 addition & 2 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Homebrew dependencies to build Descent3

# SDL
brew "sdl12-compat"
brew "sdl2_image"
brew "sdl2"

brew "cmake"
brew "googletest"
Expand Down

0 comments on commit ea32991

Please sign in to comment.