mirror of
https://github.com/decompals/wibo.git
synced 2025-12-17 00:47:18 +00:00
ci: Test on macos-15-intel
This commit is contained in:
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
@@ -150,19 +150,25 @@ jobs:
|
|||||||
|
|
||||||
build-macos:
|
build-macos:
|
||||||
name: Build macOS ${{ matrix.display }}
|
name: Build macOS ${{ matrix.display }}
|
||||||
runs-on: macos-latest
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- id: macos-debug
|
- id: macos-debug
|
||||||
|
os: macos-latest
|
||||||
display: Debug
|
display: Debug
|
||||||
preset: debug-macos
|
preset: debug-macos
|
||||||
build_dir: debug
|
build_dir: debug
|
||||||
- id: macos-release
|
- id: macos-release
|
||||||
|
os: macos-latest
|
||||||
display: Release
|
display: Release
|
||||||
preset: release-macos
|
preset: release-macos
|
||||||
build_dir: release
|
build_dir: release
|
||||||
|
# For testing only
|
||||||
|
- os: macos-15-intel
|
||||||
|
display: Release (Intel)
|
||||||
|
preset: release-macos
|
||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -183,6 +189,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v5
|
uses: actions/upload-artifact@v5
|
||||||
|
if: ${{ matrix.id }}
|
||||||
with:
|
with:
|
||||||
name: ${{ matrix.id }}
|
name: ${{ matrix.id }}
|
||||||
path: build/${{ matrix.build_dir }}/wibo
|
path: build/${{ matrix.build_dir }}/wibo
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ set(CMAKE_ASM_COMPILER_TARGET ${TARGET})
|
|||||||
|
|
||||||
# Force x86_64 architecture
|
# Force x86_64 architecture
|
||||||
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for macOS" FORCE)
|
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
|
# Search for programs in the build host directories
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ HGLOBAL WINAPI LoadResource(HMODULE hModule, HRSRC hResInfo) {
|
|||||||
|
|
||||||
LPVOID WINAPI LockResource(HGLOBAL hResData) {
|
LPVOID WINAPI LockResource(HGLOBAL hResData) {
|
||||||
HOST_CONTEXT_GUARD();
|
HOST_CONTEXT_GUARD();
|
||||||
DEBUG_LOG("LockResource(%p)\n", hResData);
|
DEBUG_LOG("STUB: LockResource(%p)\n", hResData);
|
||||||
return fromGuestPtr(hResData);
|
return fromGuestPtr(hResData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user