-
-
Notifications
You must be signed in to change notification settings - Fork 78
Apple: visionOS and tvOS builds now supported; update to 26.4 SDKs #156
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,12 @@ set -e | |
| export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" | ||
| # Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow, | ||
| # which is seen as a regression in the current workflow. | ||
| export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.1/usr/bin/swift-frontend" | ||
| export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.3.0/usr/bin/swift-frontend" | ||
| export OPTIONS_MONO="module_mono_enabled=yes" | ||
| export OPTIONS_DOTNET="module_dotnet_enabled=yes" | ||
| export TERM=xterm | ||
|
|
||
| export IOS_SDK="26.1" | ||
| export IOS_SDK="26.4" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I could tackle this in a follow-up, but we could also expose this as an env variable so we don't need to adjust build scripts every time we update the SDKs. |
||
| export IOS_DEVICE="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IOS_SDK}.sdk" | ||
| export IOS_SIMULATOR="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IOS_SDK}.sdk simulator=yes" | ||
| export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| # Config | ||
|
|
||
| export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no" | ||
| # Keep LTO disabled for tvOS - it works but it makes linking apps on deploy very slow, | ||
| # which is seen as a regression in the current workflow (mirrors the iOS build). | ||
| export OPTIONS="production=yes use_lto=no vulkan=no opengl3=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.3.0/usr/bin/swift-frontend" | ||
| export OPTIONS_MONO="module_mono_enabled=yes" | ||
| export OPTIONS_DOTNET= | ||
| export TERM=xterm | ||
|
|
||
| export TVOS_SDK="26.4" | ||
| export TVOS_DEVICE="TVOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS${TVOS_SDK}.sdk" | ||
| export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-" | ||
|
|
||
| rm -rf godot | ||
| mkdir godot | ||
| cd godot | ||
| tar xf /root/godot.tar.gz --strip-components=1 | ||
|
|
||
| # Classical | ||
|
|
||
| if [ "${CLASSICAL}" == "1" ]; then | ||
| echo "Starting classical build for tvOS..." | ||
|
|
||
| # arm64 device | ||
| $SCONS platform=tvos $OPTIONS arch=arm64 target=template_debug $TVOS_DEVICE $APPLE_TARGET_ARM64 | ||
| $SCONS platform=tvos $OPTIONS arch=arm64 target=template_release $TVOS_DEVICE $APPLE_TARGET_ARM64 | ||
|
|
||
| # tvOS simulator builds are intentionally not produced. | ||
|
|
||
| mkdir -p /root/out/templates | ||
| cp bin/libgodot.tvos.template_release.arm64.a /root/out/templates/libgodot.tvos.a | ||
| cp bin/libgodot.tvos.template_debug.arm64.a /root/out/templates/libgodot.tvos.debug.a | ||
| fi | ||
|
|
||
| # Mono | ||
|
|
||
| if [ "${MONO}" == "1" ]; then | ||
| echo "Starting Mono build for tvOS..." | ||
|
|
||
| cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/ | ||
|
|
||
| # arm64 device | ||
| $SCONS platform=tvos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $TVOS_DEVICE $APPLE_TARGET_ARM64 | ||
| $SCONS platform=tvos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $TVOS_DEVICE $APPLE_TARGET_ARM64 | ||
|
|
||
| # tvOS simulator builds are intentionally not produced. | ||
|
|
||
| mkdir -p /root/out/templates-mono | ||
| cp bin/libgodot.tvos.template_release.arm64.a /root/out/templates-mono/libgodot.tvos.a | ||
| cp bin/libgodot.tvos.template_debug.arm64.a /root/out/templates-mono/libgodot.tvos.debug.a | ||
| fi | ||
|
|
||
| echo "tvOS build successful" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should add a
SWIFT_VERSIONenv toDockerfile.osxso we can reuse it here and in the other places.