diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b821c4a24..fef8ebbbc 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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 diff --git a/mk/macos/setupBuildDeps.sh b/mk/macos/setupBuildDeps.sh index 06ee0d9b5..40aab3619 100755 --- a/mk/macos/setupBuildDeps.sh +++ b/mk/macos/setupBuildDeps.sh @@ -1,7 +1,6 @@ #!/bin/sh brew update && \ -brew upgrade && \ -brew reinstall cmake \ +brew install cmake \ cppunit \ curl \ expat \ @@ -11,13 +10,11 @@ brew reinstall cmake \ ftgl \ glew \ jpeg-turbo \ - libnghttp2 \ libogg \ libpng \ libvorbis \ lua \ miniupnpc \ - openldap \ pkg-config \ sdl2 \ wxwidgets \