Cherry-picks for the godot-cpp 4.1 branch - 5th batch #1281
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
(cherry picked from commit 6e05b97)
And clean it up a bit. (cherry picked from commit 18bfa13)
…uded (cherry picked from commit b507b3e)
(cherry picked from commit 7a5cbca)
This comment enables the possibility to build the "compile_commands.json" file by only using `scons -Q compiledb`. No need to use the argument `compiledb=yes`. And when using the `compiledb=yes`, it will create a "compiled_commands.json" automatically. (cherry picked from commit 2d5024a)
(cherry picked from commit 60dfa34)
dsnopek
added
bug
This was referenced Oct 23, 2023
Member
|
In upstream Godot in 4.1, we cherry-picked the option to disable exceptions, but we didn't enable it by default, as that's IMO a compat breakage. So I would suggest doing the same for godot-cpp. |
dsnopek
force-pushed
the
4.1-cherrypicks-5
branch
from
064a518 to
389e983
Compare
Collaborator
Author
|
Ah, thanks, that makes sense! I've amended that commit to default to |
akien-mga
reviewed
Oct 23, 2023
akien-mga
reviewed
Oct 23, 2023
akien-mga
approved these changes
Oct 23, 2023
Member
akien-mga
left a comment
akien-mga
left a comment
There was a problem hiding this comment.
Aside from CMake changes for disabling exceptions, looks good to go.
Counterpart to godotengine/godot#80612. (cherry picked from commit bf1c03a)
(cherry picked from commit a61cdc8)
dsnopek
force-pushed
the
4.1-cherrypicks-5
branch
from
389e983 to
9d81331
Compare
akien-mga
approved these changes
Oct 24, 2023
Member
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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 5th batch of PR's marked with
cherrypick:4.1