Updated Bullet version to the actual bullet master commit #29418
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
|
We don't need to add the CMakeLists.txt and premake files. |
|
It looks like there are -Wreorder warnings still raised by Bullet headers. |
|
I think that these flags, have to be disabled in thirdparty dir. However remove the unwanted file is possible, but is better to not do it, because the idea is to keep the bullet update easy like a drag and drop. |
|
Try this maybe? diff --git a/modules/bullet/SCsub b/modules/bullet/SCsub
index 16d694c23..2fe7a1b4c 100644
--- a/modules/bullet/SCsub
+++ b/modules/bullet/SCsub
@@ -186,7 +186,11 @@ if env['builtin_bullet']:
thirdparty_sources = [thirdparty_dir + file for file in bullet2_src]
- env_bullet.Prepend(CPPPATH=[thirdparty_dir])
+ # Treat Bullet headers as system headers to avoid raising warnings. Not supported on MSVC.
+ if not env.msvc:
+ env_bullet.Append(CPPFLAGS=['-isystem', Dir(thirdparty_dir).path])
+ else:
+ env_bullet.Prepend(CPPPATH=[thirdparty_dir])
# if env['target'] == "debug" or env['target'] == "release_debug":
# env_bullet.Append(CPPFLAGS=['-DBT_DEBUG']) |
|
I'll force push an update to this PR with this |
This updates our local copy to commit 5ec8339b6fc491e3f09a34a4516e82787f053fcc. We need a recent master commit for some new features that we use in Godot (see godotengine#25543 and godotengine#28909). To avoid warnings generated by Bullet headers included in our own module, we include those headers with -isystem on GCC and Clang. Fixes godotengine#29503.
|
Done, let's see if it passes CI now. At least locally it doesn't trigger errors for now with |
2 tasks
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.
This PR updates the Bullet library to the last master branch commit 500264ca239d3fdf69162c75c5b40ee04baae458.
@akien-mga this PR is not yet merged, bulletphysics/bullet3#2264, I'll do another PR once this is merged so in the meantime you can merge this one.