From 455005ac09a7c97e2dfba59ce3f1ad3dc3a705a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Wed, 8 Jan 2025 13:41:54 +0100 Subject: [PATCH 1/2] Update macOS image version for CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdd471d9..e1985584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - { name: Windows Clang, os: windows-2022, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - { name: Linux GCC, os: ubuntu-22.04, flags: -GNinja } - { name: Linux Clang, os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - - { name: MacOS, os: macos-12, flags: -GNinja } + - { name: MacOS, os: macos-13, flags: -GNinja } type: - { name: Debug } - { name: Release } @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@v4 with: repository: SFML/SFML - ref: 2.6.1 + ref: 2.6.2 path: SFML - name: Configure SFML CMake From d93e3315f359f96301c945f8194b53473ca45369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Wed, 8 Jan 2025 13:00:54 +0100 Subject: [PATCH 2/2] Correct macOS rpath reference for vorbisenc --- tools/nuget/build.macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nuget/build.macos.sh b/tools/nuget/build.macos.sh index 20cafa6a..64d6c080 100755 --- a/tools/nuget/build.macos.sh +++ b/tools/nuget/build.macos.sh @@ -168,7 +168,7 @@ fixrpath() } fixrpath audio "@rpath/../Frameworks/OpenAL.framework/Versions/A/OpenAL" "@rpath/OpenAL.framework/Versions/A/OpenAL" -fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisen" +fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisenc" fixrpath audio "@rpath/../Frameworks/vorbisfile.framework/Versions/A/vorbisfile" "@rpath/vorbisfile.framework/Versions/A/vorbisfile" fixrpath audio "@rpath/../Frameworks/vorbis.framework/Versions/A/vorbis" "@rpath/vorbis.framework/Versions/A/vorbis" fixrpath audio "@rpath/../Frameworks/ogg.framework/Versions/A/ogg" "@rpath/ogg.framework/Versions/A/ogg"