Skip to content

Commit

Permalink
Revert "Update cmake.yml"
Browse files Browse the repository at this point in the history
Revert all commits that were attempts to fix macos build because nothing
works :-)
This reverts commit dbd4f8d.
  • Loading branch information
Jammyjamjamman committed Apr 16, 2024
1 parent d32221a commit 201457d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,10 @@ jobs:

- name: Get dependencies
run: |
# temp hack fix to make brew work
brew unlink python && brew link --overwrite python
brew unlink node
mk/macos/setupBuildDeps.sh
# more stupid hacks - these will need removing or changing at some point.
cd /usr/local/Cellar/libnghttp2/
# ln -s 1.58.0 1.57.0
cd -
- name: Build MegaGlest With Clang Compiler
run: |
export HOMEBREW_FORCE_BREWED_CURL=1
mk/macos/build-mg.sh -m
make -C mk/macos/build -j$(sysctl -n hw.ncpu) VERBOSE=1
Expand Down
5 changes: 1 addition & 4 deletions mk/macos/setupBuildDeps.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh
brew update && \
brew upgrade && \
brew reinstall cmake \
brew install cmake \
cppunit \
curl \
expat \
Expand All @@ -11,13 +10,11 @@ brew reinstall cmake \
ftgl \
glew \
jpeg-turbo \
libnghttp2 \
libogg \
libpng \
libvorbis \
lua \
miniupnpc \
openldap \
pkg-config \
sdl2 \
wxwidgets \
Expand Down

0 comments on commit 201457d

Please sign in to comment.