Skip to content

Commit 8fa251f

Browse files
authored
Fix macOS linking* (#2527)
1 parent 3a3388c commit 8fa251f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/build-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
arch: [x86_64, arm64]
2323

2424
name: ${{ matrix.arch }}
25-
runs-on: macos-14
25+
runs-on: macos-26
2626

2727
env:
2828
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
@@ -71,7 +71,7 @@ jobs:
7171
universal-binary:
7272
name: Universal binary
7373
needs: [build-macos]
74-
runs-on: macos-13
74+
runs-on: macos-26
7575
continue-on-error: true
7676
steps:
7777
- name: Download x86_64

src/frontend/qt_sdl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ if (BUILD_STATIC)
176176
if (USE_VCPKG AND UNIX AND NOT APPLE)
177177
pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa)
178178
target_link_libraries(melonDS PRIVATE PkgConfig::ALSA)
179-
else()
179+
elseif (NOT APPLE)
180180
target_link_options(melonDS PRIVATE -static)
181181
endif()
182182
endif()

vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"default-registry": {
44
"kind": "git",
55
"repository": "https://github.com/Microsoft/vcpkg",
6-
"baseline": "dd3097e305afa53f7b4312371f62058d2e665320",
7-
"reference": "dd3097e305afa53f7b4312371f62058d2e665320"
6+
"baseline": "55fab67aea1027f7179ae6b5c54a5ba9091c16aa",
7+
"reference": "55fab67aea1027f7179ae6b5c54a5ba9091c16aa"
88
},
99
"overlay-ports": [ "./cmake/overlay-ports" ],
1010
"overlay-triplets": [ "./cmake/overlay-triplets" ]

0 commit comments

Comments
 (0)