Cherry-picks for the godot-cpp 4.2 branch - 2nd batch #1410
Conversation
This file contains 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
(cherry picked from commit 59a5a8b)
(cherry picked from commit 6a3753c)
Use with: `scons platform=os2 custom_tools=/path/to/tools` (assuming you have an `os2.py` inside `/path/to/tools/`) (cherry picked from commit baaad7a)
Split `targets` tool logic, moving all the compiler-specific flags to a new `common_compiler_flags.py` file, and everything else (CPPDEFINES, optimize option logic, dev build logic, etc) to the `godotcpp` tool. The default tools now apply the common compiler flags by importing the file and explicitly calling `configure`. (cherry picked from commit 16df4bf)
(cherry picked from commit b173a4d)
(cherry picked from commit 23c0109)
(cherry picked from commit e607790)
(cherry picked from commit 7ed8ef7)
dsnopek
added
bug
This was referenced Mar 11, 2024
Merged
(cherry picked from commit 8c98a90)
…to initialize (cherry picked from commit c4fde85)
(cherry picked from commit 87f5fb0)
This is because target_link_options was added in v3.13 So this wouldn't build with cmake v3.12 Likewise in CMAKE_CXX_STANDARD only supports value of 17 starting with cmake v3.9 So the test wouldn't build properly with cmake v3.6 (cherry picked from commit 5c12bd2)
(cherry picked from commit d055b57)
This was referenced Apr 8, 2024
Merged
AThousandShips
approved these changes
Apr 8, 2024
This was referenced Apr 8, 2024
|
Thanks for the review! |
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.2