File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 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
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
Original file line number Diff line number Diff 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 ()
182182endif ()
Original file line number Diff line number Diff line change 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" ]
You can’t perform that action at this time.
0 commit comments