diff --git a/.github/workflows/build-coop.yaml b/.github/workflows/build-coop.yaml index 70803349e..166809e60 100644 --- a/.github/workflows/build-coop.yaml +++ b/.github/workflows/build-coop.yaml @@ -26,7 +26,7 @@ jobs: cd tools g++ -std=c++17 -o hash_file hash_file.cpp echo "::notice ::$(./hash_file ../build/us_pc/sm64coopdx)" - + - name: Zip the game run: | cd ./build/us_pc @@ -37,7 +37,7 @@ jobs: with: name: sm64coopdx-linux path: ./build/us_pc/sm64coopdx_Linux.zip - + build-steamos: if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[build]') }} runs-on: ubuntu-22.04 @@ -58,7 +58,7 @@ jobs: cd tools g++ -std=c++17 -o hash_file hash_file.cpp echo "::notice ::$(./hash_file ../build/us_pc/sm64coopdx)" - + - name: Zip the game run: | cd ./build/us_pc @@ -108,7 +108,7 @@ jobs: cd tools g++ -std=c++17 -o hash_file.exe hash_file.cpp echo "::notice ::$(./hash_file.exe ../build/us_pc/sm64coopdx.exe)" - + - name: Zip the game run: | cd ./build/us_pc @@ -158,7 +158,7 @@ jobs: cd tools g++ -std=c++17 -o hash_file.exe hash_file.cpp echo "::notice ::$(./hash_file.exe ../build/us_pc/sm64coopdx.exe)" - + - name: Zip the game run: | cd ./build/us_pc @@ -187,23 +187,8 @@ jobs: curl -L -o glew.tar.gz https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.tgz tar -xzf glew.tar.gz cd glew-2.2.0 - make SYSTEM=darwin CC="clang -arch arm64 -mmacosx-version-min=11" GLEW_PREFIX=/opt/homebrew + make SYSTEM=darwin CC="clang -arch arm64 -mmacosx-version-min=11" GLEW_PREFIX=/opt/homebrew GLEW_DEST=/opt/homebrew make install GLEW_PREFIX=/opt/homebrew GLEW_DEST=/opt/homebrew - cat > glew.pc <<'EOF' - prefix=/opt/homebrew - exec_prefix=${prefix} - libdir=${exec_prefix}/lib - includedir=${prefix}/include - - Name: glew - Description: The OpenGL Extension Wrangler library - Version: 2.2.0 - Cflags: -I${includedir} - Libs: -L${libdir} -lGLEW -framework OpenGL - EOF - - sudo mkdir -p /opt/homebrew/lib/pkgconfig - sudo cp glew.pc /opt/homebrew/lib/pkgconfig/ - name: Compile SDL2 run: | @@ -233,7 +218,7 @@ jobs: run: | cd ./build/us_pc zip -r sm64coopdx_macOS_ARM.zip sm64coopdx.app - + - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -287,7 +272,7 @@ jobs: run: | cd ./build/us_pc zip -r sm64coopdx_macOS_Intel.zip sm64coopdx.app - + - name: Upload artifact uses: actions/upload-artifact@v4 with: diff --git a/Makefile b/Makefile index a37838618..4c68198d0 100644 --- a/Makefile +++ b/Makefile @@ -782,7 +782,7 @@ else ifeq ($(findstring SDL,$(WINDOW_API)),SDL) else ifeq ($(TARGET_RK3588),1) BACKEND_LDFLAGS += -lGLESv2 else ifeq ($(OSX_BUILD),1) - BACKEND_LDFLAGS += -L$(BREW_PREFIX) -framework OpenGL `pkg-config --libs glew` -mmacosx-version-min=$(MIN_MACOS_VERSION) + BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew` -mmacosx-version-min=$(MIN_MACOS_VERSION) EXTRA_CPP_FLAGS += -stdlib=libc++ -std=c++17 -mmacosx-version-min=$(MIN_MACOS_VERSION) else BACKEND_LDFLAGS += -lGL @@ -821,7 +821,7 @@ ifneq ($(SDL1_USED)$(SDL2_USED),00) ifeq ($(OSX_BUILD),1) # on OSX at least the homebrew version of sdl-config gives include path as `.../include/SDL2` instead of `.../include` OSX_PREFIX := $(shell $(SDLCONFIG) --prefix) - BACKEND_CFLAGS += -I$(BREW_PREFIX)/include -I$(OSX_PREFIX)/include $(shell $(SDLCONFIG) --cflags) + BACKEND_CFLAGS += -I$(OSX_PREFIX)/include $(shell $(SDLCONFIG) --cflags) else BACKEND_CFLAGS += `$(SDLCONFIG) --cflags` endif