ci: Test on macos-15-intel

This commit is contained in:
2025-11-11 23:35:14 -07:00
parent 276d4cd7af
commit ecd8231dee
3 changed files with 10 additions and 3 deletions

View File

@@ -150,19 +150,25 @@ jobs:
build-macos:
name: Build macOS ${{ matrix.display }}
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- id: macos-debug
os: macos-latest
display: Debug
preset: debug-macos
build_dir: debug
- id: macos-release
os: macos-latest
display: Release
preset: release-macos
build_dir: release
# For testing only
- os: macos-15-intel
display: Release (Intel)
preset: release-macos
steps:
- name: Install dependencies
run: |
@@ -183,6 +189,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v5
if: ${{ matrix.id }}
with:
name: ${{ matrix.id }}
path: build/${{ matrix.build_dir }}/wibo

View File

@@ -10,7 +10,7 @@ set(CMAKE_ASM_COMPILER_TARGET ${TARGET})
# Force x86_64 architecture
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for macOS" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum macOS deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum macOS deployment version" FORCE)
# Search for programs in the build host directories
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

View File

@@ -205,7 +205,7 @@ HGLOBAL WINAPI LoadResource(HMODULE hModule, HRSRC hResInfo) {
LPVOID WINAPI LockResource(HGLOBAL hResData) {
HOST_CONTEXT_GUARD();
DEBUG_LOG("LockResource(%p)\n", hResData);
DEBUG_LOG("STUB: LockResource(%p)\n", hResData);
return fromGuestPtr(hResData);
}