Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add macos-14 target to build-publish.yml #131

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add macos-14 target to build-publish.yml #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0dd3689
Add macos-14 target to build-publish.yml
MatPoliquin Jan 17, 2025
ad38429
bumped lua version from 5.1 to 5.3
MatPoliquin Jan 17, 2025
bf55826
Update pyproject.toml
MatPoliquin Jan 17, 2025
adbcc8d
Disable snes9x for macos
MatPoliquin Jan 17, 2025
6c87f84
Update CMakeLists.txt
MatPoliquin Jan 17, 2025
e05ed71
Update build-publish.yml
MatPoliquin Jan 17, 2025
72f945e
Update build-publish.yml
MatPoliquin Jan 17, 2025
ab15cc4
Update pyproject.toml
MatPoliquin Jan 17, 2025
9735a10
Update pyproject.toml
MatPoliquin Jan 17, 2025
cb7ec9a
Update pyproject.toml
MatPoliquin Jan 18, 2025
41c91a7
Update pyproject.toml
MatPoliquin Jan 18, 2025
efbf6c1
Update pyproject.toml
MatPoliquin Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04] #, macos-11] - disable macos, as it's not working for a moment
os: [ubuntu-22.04, macos-14]

steps:
- uses: actions/checkout@v3
Expand Down
19 changes: 11 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,21 +228,24 @@ function(add_core platform core_name)
WORKING_DIRECTORY "cores/${platform}/${subdir}")
endfunction()

add_core(snes snes9x)

add_core(genesis genesis_plus_gx)
add_core(nes fceumm)
add_core(atari2600 stella)


if(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
message(warning "Detected Apple Silicon, skipping gambatte (gb)")
message(warning "Detected Apple Silicon, skipping gambatte (gb) and snes9x")
else()
add_core(gb gambatte)
add_core(snes snes9x)
add_core(nes fceumm)
add_core(atari2600 stella)
add_core(gba mgba)
add_core(pce mednafen_pce_fast)
add_core(32x picodrive)
add_core(saturn mednafen_saturn)
endif()

add_core(gba mgba)
add_core(pce mednafen_pce_fast)
add_core(32x picodrive)
add_core(saturn mednafen_saturn)


set(CLEAN_CORES)

Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_28"

[tool.cibuildwheel.macos]
before-all = "brew install pkg-config capnp [email protected] qt5"
before-all = [
"brew install pkg-config capnp [email protected] qt5",
"sudo xcode-select -s /Library/Developer/CommandLineTools",
"export PATH='/opt/homebrew/opt/qt@5/bin:$PATH'",
"export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)"
]
Loading