diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fc60808..b1e83a5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,10 +23,8 @@ jobs: - name: Install macOS dependencies if: ${{ matrix.os.preset == 'mac' }} run: | - # Note this is x86_64 Homebrew - /usr/local/bin/brew install sdl12-compat sdl2_image - curl --output-dir /tmp -fsSLO https://github.com/XQuartz/XQuartz/releases/download/XQuartz-2.8.5/XQuartz-2.8.5.pkg - sudo installer -pkg /tmp/XQuartz-2.8.5.pkg -target LocalSystem + # Install packages from Homebrew + brew bundle install - name: Configure CMake run: cmake --preset ${{matrix.os.preset}} -B ${{github.workspace}}/build diff --git a/Brewfile b/Brewfile index e9116ff1..f2a1b235 100644 --- a/Brewfile +++ b/Brewfile @@ -1,8 +1,9 @@ # Homebrew dependencies to build Descent3 # XQuartz required for OpenGL and glx.h (not included in Xcode) -brew "xquartz" +tap "homebrew/cask" +cask "xquartz" -# SDL -brew "sdl12_compat" +# SDL +brew "sdl12-compat" brew "sdl2_image"