Skip to content

adds support for macOS catalyst #3296

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

adds support for macOS catalyst #3296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a09641d
adds support for macOS catalyst
itsthisjustin Aug 18, 2025
ec71440
fix: Add Skia header search path for Catalyst builds
itsthisjustin Aug 18, 2025
a536bea
Revert "fix: Add Skia header search path for Catalyst builds"
itsthisjustin Aug 18, 2025
90e1f62
Removes extra flags that aren't needed
itsthisjustin Aug 28, 2025
b1d2d0d
Merge branch 'main' into catalyst-support
itsthisjustin Aug 28, 2025
6de680a
Merge branch 'Shopify:main' into catalyst-support
itsthisjustin Sep 7, 2025
34ccbb8
Merge branch 'main' into catalyst-support
itsthisjustin Sep 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
8 changes: 8 additions & 0 deletions packages/skia/scripts/build-skia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ const buildXCFrameworks = () => {
// eslint-disable-next-line max-len
`lipo -create ${OutFolder}/${os}/x64-iphonesimulator/${name} ${OutFolder}/${os}/arm64-iphonesimulator/${name} -output ${OutFolder}/${os}/iphonesimulator/${name}`
);
$(`mkdir -p ${OutFolder}/${os}/maccatalyst`);
$(`rm -rf ${OutFolder}/${os}/maccatalyst/${name}`);
$(
// eslint-disable-next-line max-len
`lipo -create ${OutFolder}/${os}/x64-maccatalyst/${name} ${OutFolder}/${os}/arm64-maccatalyst/${name} -output ${OutFolder}/${os}/maccatalyst/${name}`
);
$(`mkdir -p ${OutFolder}/${os}/macosx`);
$(`rm -rf ${OutFolder}/${os}/macosx/${name}`);
$(
Expand All @@ -155,13 +161,15 @@ const buildXCFrameworks = () => {
`-library ${prefix}/arm64-iphoneos/${name} ` +
`-library ${prefix}/iphonesimulator/${name} ` +
`-library ${prefix}/macosx/${name} ` +
`-library ${prefix}/maccatalyst/${name} ` +
` -output ${dstPath}`
: "xcodebuild -create-xcframework " +
`-library ${prefix}/arm64-iphoneos/${name} ` +
`-library ${prefix}/iphonesimulator/${name} ` +
`-library ${prefix}/arm64-tvos/${name} ` +
`-library ${prefix}/tvsimulator/${name} ` +
`-library ${prefix}/macosx/${name} ` +
`-library ${prefix}/maccatalyst/${name} ` +
` -output ${dstPath}`;

$(xcframeworkCmd);
Expand Down
49 changes: 49 additions & 0 deletions packages/skia/scripts/skia-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import path from "path";

import { $ } from "./utils";
import { spawnSync } from "child_process";

const DEBUG = false;
export const GRAPHITE = !!process.env.SK_GRAPHITE;
Expand Down Expand Up @@ -228,6 +229,54 @@ export const configurations = {
args: [["ios_min_target", `"${appleSimulatorMinTarget}"`]],
},
...tvosTargets,
"arm64-maccatalyst": {
cpu: "arm64",
platform: "mac",
args: [
["skia_enable_gpu", true],
["target_os", `"mac"`],
["target_cpu", `"arm64"`],
["mac_deployment_target", `"14.0"`],
[
"extra_cflags",
`["-target","arm64-apple-ios14.0-macabi",` +
`"-isysroot","${appleSdkRoot}",` +
`"-isystem","${appleSdkRoot}/System/iOSSupport/usr/include",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
],
[
"extra_ldflags",
`["-isysroot","${appleSdkRoot}",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
],
["cc", "\"clang\""],
["cxx", "\"clang++\""],
],
},
"x64-maccatalyst": {
cpu: "x64",
platform: "mac",
args: [
["skia_enable_gpu", true],
["target_os", `"mac"`],
["target_cpu", `"x64"`],
["mac_deployment_target", `"14.0"`],
[
"extra_cflags",
`["-target","x86_64-apple-ios14.0-macabi",` +
`"-isysroot","${appleSdkRoot}",` +
`"-isystem","${appleSdkRoot}/System/iOSSupport/usr/include",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
],
[
"extra_ldflags",
`["-isysroot","${appleSdkRoot}",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
],
["cc", "\"clang\""],
["cxx", "\"clang++\""],
],
},
"arm64-macosx": {
platformGroup: "macosx",
cpu: "arm64",
Expand Down