Cherry-picks for the godot-cpp 4.4 branch - 2nd batch #1805
Conversation
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
…1f50241464 (4.4.1-stable)
(cherry picked from commit 107cb1d)
(cherry picked from commit 7056c99)
(cherry picked from commit c963321)
(cherry picked from commit 075b517)
(cherry picked from commit 1edfca2)
(cherry picked from commit d239da3)
…r `wchar_t` (cherry picked from commit 035add9)
(cherry picked from commit 7ffaecc)
(cherry picked from commit aa03c32)
(cherry picked from commit b0f4190)
(cherry picked from commit a2c37f8)
- Duplicated the ci.yml into ci-scons.yml and ci-cmake.yml - Replaced some manual shell commands to detect changes with tj-actions/changed-files@v45 - Conditionally run the CI depending on what files change. - Add ios toolchain from leetal/ios-cmake - Added a cmake-minimum of 3.10 to silence errors from ios toolchain (cherry picked from commit b6c0251)
(cherry picked from commit 335b490)
(cherry picked from commit 552a74c)
(cherry picked from commit 38e517b)
(cherry picked from commit 7e6c9c9)
(cherry picked from commit d634a5f)
(cherry picked from commit 26201dd)
(cherry picked from commit 7670de8)
(cherry picked from commit 30bfa6f)
(cherry picked from commit f38c056)
(cherry picked from commit 7fd0999)
(cherry picked from commit 7660dd2)
This is required when publishing to the App Store, and consistent with what we already do for the macOS deployment target. (cherry picked from commit 4879eb7)
(cherry picked from commit 64cdf08)
(cherry picked from commit 42f6dc6)
This was referenced Jun 24, 2025
Merged
Merged
(cherry picked from commit 8938e7e)
aaronfranke
approved these changes
Jul 2, 2025
There was a problem hiding this comment.
Tested on Godot 4D and it compiles as-is, and runs with both Godot 4.4.1 and master (4.5.beta). Note that Godot 4.4.0 did not work, it gave an error that 4.4.1 or later is required.
|
@aaronfranke Thanks for testing!
This would also be the case using the If you want to continue to support 4.4.0+, then you'll need to build using the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The 2nd batch of PR's marked with
cherrypick:4.4The was the biggest cherry-picking batch I've ever done - I waited way too long to do it :-)