leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for MacOS ARM64 (#3862)

Browse source
This commit is contained in:
daxpedda 2024-08-13 23:01:17 +02:00 • committed by GitHub
parent a96491f302
commit 7fbc2118b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View file

@ -68,7 +68,8 @@ jobs:
- { name: 'Wayland', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' } - { name: 'Wayland', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' }
- { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } - { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
- { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest, } - { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest, }
- { name: 'macOS', target: x86_64-apple-darwin, os: macos-latest, } - { name: 'macOS x86_64', target: x86_64-apple-darwin, os: macos-latest, }
- { name: 'macOS Aarch64', target: aarch64-apple-darwin, os: macos-latest, }
- { name: 'iOS x86_64', target: x86_64-apple-ios, os: macos-latest, } - { name: 'iOS x86_64', target: x86_64-apple-ios, os: macos-latest, }
- { name: 'iOS Aarch64', target: aarch64-apple-ios, os: macos-latest, } - { name: 'iOS Aarch64', target: aarch64-apple-ios, os: macos-latest, }
- { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, } - { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, }
@ -243,10 +244,11 @@ jobs:
- { name: 'Android', target: aarch64-linux-android } - { name: 'Android', target: aarch64-linux-android }
- { name: 'iOS', target: aarch64-apple-ios } - { name: 'iOS', target: aarch64-apple-ios }
- { name: 'Linux', target: x86_64-unknown-linux-gnu } - { name: 'Linux', target: x86_64-unknown-linux-gnu }
- { name: 'macOS', target: x86_64-apple-darwin } - { name: 'macOS', target: aarch64-apple-darwin }
- { name: 'Redox OS', target: x86_64-unknown-redox } - { name: 'Redox OS', target: x86_64-unknown-redox }
- { name: 'Web', target: wasm32-unknown-unknown } - { name: 'Web', target: wasm32-unknown-unknown }
- { name: 'Windows', target: x86_64-pc-windows-gnu } - { name: 'Windows GNU', target: x86_64-pc-windows-gnu }
- { name: 'Windows MSVC', target: x86_64-pc-windows-msvc }
steps: steps:
- uses: taiki-e/checkout-action@v1 - uses: taiki-e/checkout-action@v1

3
Cargo.toml
View file

@ -38,12 +38,13 @@ targets = [
"i686-pc-windows-msvc", "i686-pc-windows-msvc",
"x86_64-pc-windows-msvc", "x86_64-pc-windows-msvc",
# macOS # macOS
"aarch64-apple-darwin",
"x86_64-apple-darwin", "x86_64-apple-darwin",
# Unix (X11 & Wayland) # Unix (X11 & Wayland)
"i686-unknown-linux-gnu", "i686-unknown-linux-gnu",
"x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu",
# iOS # iOS
"x86_64-apple-ios", "aarch64-apple-ios",
# Android # Android
"aarch64-linux-android", "aarch64-linux-android",
# Web # Web

1
deny.toml
View file

@ -7,6 +7,7 @@
all-features = true all-features = true
exclude-dev = true exclude-dev = true
targets = [ targets = [
{ triple = "aarch64-apple-darwin" },
{ triple = "aarch64-apple-ios" }, { triple = "aarch64-apple-ios" },
{ triple = "aarch64-linux-android" }, { triple = "aarch64-linux-android" },
{ triple = "i686-pc-windows-gnu" }, { triple = "i686-pc-windows-gnu" },

3
dpi/Cargo.toml
View file

@ -26,12 +26,13 @@ targets = [
"i686-pc-windows-msvc", "i686-pc-windows-msvc",
"x86_64-pc-windows-msvc", "x86_64-pc-windows-msvc",
# macOS # macOS
"aarch64-apple-darwin",
"x86_64-apple-darwin", "x86_64-apple-darwin",
# Unix (X11 & Wayland) # Unix (X11 & Wayland)
"i686-unknown-linux-gnu", "i686-unknown-linux-gnu",
"x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu",
# iOS # iOS
"x86_64-apple-ios", "aarch64-apple-ios",
# Android # Android
"aarch64-linux-android", "aarch64-linux-android",
# Web # Web

8
src/platform/macos.rs
View file

@ -365,11 +365,11 @@ pub trait EventLoopBuilderExtMacOS {
/// Set the activation policy to "accessory". /// Set the activation policy to "accessory".
/// ///
/// ``` /// ```
/// use winit::event_loop::EventLoopBuilder; /// use winit::event_loop::EventLoop;
/// #[cfg(target_os = "macos")] /// #[cfg(target_os = "macos")]
/// use winit::platform::macos::{ActivationPolicy, EventLoopBuilderExtMacOS}; /// use winit::platform::macos::{ActivationPolicy, EventLoopBuilderExtMacOS};
/// ///
/// let mut builder = EventLoopBuilder::new(); /// let mut builder = EventLoop::builder();
/// #[cfg(target_os = "macos")] /// #[cfg(target_os = "macos")]
/// builder.with_activation_policy(ActivationPolicy::Accessory); /// builder.with_activation_policy(ActivationPolicy::Accessory);
/// # if false { // We can't test this part /// # if false { // We can't test this part
@ -387,11 +387,11 @@ pub trait EventLoopBuilderExtMacOS {
/// Disable creating a default menubar. /// Disable creating a default menubar.
/// ///
/// ``` /// ```
/// use winit::event_loop::EventLoopBuilder; /// use winit::event_loop::EventLoop;
/// #[cfg(target_os = "macos")] /// #[cfg(target_os = "macos")]
/// use winit::platform::macos::EventLoopBuilderExtMacOS; /// use winit::platform::macos::EventLoopBuilderExtMacOS;
/// ///
/// let mut builder = EventLoopBuilder::new(); /// let mut builder = EventLoop::builder();
/// #[cfg(target_os = "macos")] /// #[cfg(target_os = "macos")]
/// builder.with_default_menu(false); /// builder.with_default_menu(false);
/// # if false { // We can't test this part /// # if false { // We can't test this part