mac: Add arm64 build

yue · Sep 20, 2020 · 16f68da · 16f68da
1 parent 10c4186
commit 16f68da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,12 +33,18 @@ jobs:
 - job: macos_build
   displayName: 'Build for macOS'
   pool:
-    vmImage: 'macOS-10.14'
+    vmImage: 'macOS-latest'
   strategy:
     matrix:
       x64:
         TARGET_CPU: x64
+      arm64:
+        TARGET_CPU: arm64
   steps:
+  - script: |
+      sudo xcode-select -switch /Applications/Xcode_12_beta.app/Contents/Developer
+    displayName: Select XCode 12
+    condition: eq(variables['TARGET_CPU'], 'arm64')
   - template: building/azure-pipelines-template.yml
 
 - job: linux_build

diff --git a/base b/base
diff --git a/nativeui/mac/button_mac.mm b/nativeui/mac/button_mac.mm
@@ -19,6 +19,9 @@
   } else if ([button bezelStyle] == NSRoundedBezelStyle) {
     NSControlSize size = [[button cell] controlSize];
     switch (size) {
+#if defined(MAC_OS_VERSION_11_0)
+      case NSControlSizeLarge:
+#endif
       case NSRegularControlSize: return nu::InsetsF(4, 6, 7, 6);
       case NSSmallControlSize: return nu::InsetsF(4, 5, 6, 5);
       case NSMiniControlSize: return nu::InsetsF(0, 1, 1, 1);