Skip to content

Commit e23bef1

Browse files
committed
Provide per-triplet constants
1 parent 3e49fe8 commit e23bef1

File tree

1 file changed

+42
-7
lines changed

1 file changed

+42
-7
lines changed

packages/cmake-rn/src/platforms/apple.ts

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,22 @@ const XCODE_SDK_NAMES = {
6262
"x86_64-apple-darwin": "macosx",
6363
"arm64-apple-darwin": "macosx",
6464
"arm64;x86_64-apple-darwin": "macosx",
65+
6566
"arm64-apple-ios": "iphoneos",
6667
"arm64-apple-ios-sim": "iphonesimulator",
67-
"arm64-apple-tvos": "appletvos",
68+
"x86_64-apple-ios-sim": "iphonesimulator",
69+
"arm64;x86_64-apple-ios-sim": "iphonesimulator",
70+
6871
// "x86_64-apple-tvos": "appletvos",
72+
"arm64-apple-tvos": "appletvos",
73+
"x86_64-apple-tvos-sim": "appletvsimulator",
6974
"arm64-apple-tvos-sim": "appletvsimulator",
75+
"arm64;x86_64-apple-tvos-sim": "appletvsimulator",
76+
7077
"arm64-apple-visionos": "xros",
7178
"arm64-apple-visionos-sim": "xrsimulator",
79+
"x86_64-apple-visionos-sim": "xrsimulator",
80+
"arm64;x86_64-apple-visionos-sim": "xrsimulator",
7281
} satisfies Record<Triplet, XcodeSDKName>;
7382

7483
type CMakeSystemName = "Darwin" | "iOS" | "tvOS" | "watchOS" | "visionOS";
@@ -77,27 +86,44 @@ const CMAKE_SYSTEM_NAMES = {
7786
"x86_64-apple-darwin": "Darwin",
7887
"arm64-apple-darwin": "Darwin",
7988
"arm64;x86_64-apple-darwin": "Darwin",
89+
8090
"arm64-apple-ios": "iOS",
8191
"arm64-apple-ios-sim": "iOS",
82-
"arm64-apple-tvos": "tvOS",
92+
"x86_64-apple-ios-sim": "iOS",
93+
"arm64;x86_64-apple-ios-sim": "iOS",
94+
8395
// "x86_64-apple-tvos": "appletvos",
96+
"arm64-apple-tvos": "tvOS",
8497
"arm64-apple-tvos-sim": "tvOS",
98+
"x86_64-apple-tvos-sim": "tvOS",
99+
"arm64;x86_64-apple-tvos-sim": "tvOS",
100+
85101
"arm64-apple-visionos": "visionOS",
102+
"x86_64-apple-visionos-sim": "visionOS",
86103
"arm64-apple-visionos-sim": "visionOS",
104+
"arm64;x86_64-apple-visionos-sim": "visionOS",
87105
} satisfies Record<Triplet, CMakeSystemName>;
88106

89107
const DESTINATION_BY_TRIPLET = {
108+
"x86_64-apple-darwin": "generic/platform=macOS",
109+
"arm64-apple-darwin": "generic/platform=macOS",
110+
"arm64;x86_64-apple-darwin": "generic/platform=macOS",
111+
90112
"arm64-apple-ios": "generic/platform=iOS",
91113
"arm64-apple-ios-sim": "generic/platform=iOS Simulator",
114+
"x86_64-apple-ios-sim": "generic/platform=iOS Simulator",
115+
"arm64;x86_64-apple-ios-sim": "generic/platform=iOS Simulator",
116+
92117
"arm64-apple-tvos": "generic/platform=tvOS",
93118
// "x86_64-apple-tvos": "generic/platform=tvOS",
119+
"x86_64-apple-tvos-sim": "generic/platform=tvOS Simulator",
94120
"arm64-apple-tvos-sim": "generic/platform=tvOS Simulator",
121+
"arm64;x86_64-apple-tvos-sim": "generic/platform=tvOS Simulator",
122+
95123
"arm64-apple-visionos": "generic/platform=visionOS",
96124
"arm64-apple-visionos-sim": "generic/platform=visionOS Simulator",
97-
// TODO: Verify that the three following destinations are correct and actually work
98-
"x86_64-apple-darwin": "generic/platform=macOS,arch=x86_64",
99-
"arm64-apple-darwin": "generic/platform=macOS,arch=arm64",
100-
"arm64;x86_64-apple-darwin": "generic/platform=macOS",
125+
"x86_64-apple-visionos-sim": "generic/platform=visionOS Simulator",
126+
"arm64;x86_64-apple-visionos-sim": "generic/platform=visionOS Simulator",
101127
} satisfies Record<Triplet, string>;
102128

103129
type AppleArchitecture = "arm64" | "x86_64" | "arm64;x86_64";
@@ -106,13 +132,22 @@ export const APPLE_ARCHITECTURES = {
106132
"x86_64-apple-darwin": "x86_64",
107133
"arm64-apple-darwin": "arm64",
108134
"arm64;x86_64-apple-darwin": "arm64;x86_64",
135+
109136
"arm64-apple-ios": "arm64",
110137
"arm64-apple-ios-sim": "arm64",
111-
"arm64-apple-tvos": "arm64",
138+
"x86_64-apple-ios-sim": "x86_64",
139+
"arm64;x86_64-apple-ios-sim": "arm64;x86_64",
140+
112141
// "x86_64-apple-tvos": "x86_64",
142+
"arm64-apple-tvos": "arm64",
113143
"arm64-apple-tvos-sim": "arm64",
144+
"x86_64-apple-tvos-sim": "x86_64",
145+
"arm64;x86_64-apple-tvos-sim": "arm64;x86_64",
146+
114147
"arm64-apple-visionos": "arm64",
148+
"x86_64-apple-visionos-sim": "x86_64",
115149
"arm64-apple-visionos-sim": "arm64",
150+
"arm64;x86_64-apple-visionos-sim": "arm64;x86_64",
116151
} satisfies Record<Triplet, AppleArchitecture>;
117152

118153
export function createPlistContent(values: Record<string, string>) {

0 commit comments

Comments
 (0)