Skip to content
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

bullet: Sync with upstream 2.89 #34921

Merged
merged 1 commit into from
Jan 8, 2020
Merged

Conversation

akien-mga
Copy link
Member

This allows distro unbundling again for distros that ship Bullet 2.89+.


Note that this may cause some transient issues for people compiling the master branch, as I've noticed that not all build objects seem to be properly regenerated. Everything builds and links fine, but right after this commit I got some double free corruption kinds of errors...

I advise cleaning up with rm -rf thirdparty/bullet modules/bullet && git checkout . before re-building after this is merged to ensure that you're building pristine bullet 2.89.

This allows distro unbundling again for distros that ship Bullet 2.89+.
@@ -182,6 +193,9 @@ if env['builtin_bullet']:
, "LinearMath/btSerializer64.cpp"
, "LinearMath/btThreads.cpp"
, "LinearMath/btVector3.cpp"
, "LinearMath/TaskScheduler/btTaskScheduler.cpp"
, "LinearMath/TaskScheduler/btThreadSupportPosix.cpp"
, "LinearMath/TaskScheduler/btThreadSupportWin32.cpp"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were new in 2.88 but we missed them.
I don't know if that's something we actually use, but since we tend to build everything but Bullet3* stuff so far, I added them.

@akien-mga
Copy link
Member Author

@AndreaCatania BTW, the previous sync added the Common and All files in https://github.com/godotengine/godot/tree/master/thirdparty/bullet which can be used instead of listing all single files to make a unity build.

That could be quite interesting for us I think to reduce the length of the compilation line (should help with slowdown on Windows when linking libmodules.a) and hopefully speed up build a bit too.

I do fear however that those files may not be fully up to date with current 2.89 source files. The unity build files were added in bulletphysics/bullet3@77a9a77 but AFAICS never updated since.

@akien-mga
Copy link
Member Author

Note that this may cause some transient issues for people compiling the master branch, as I've noticed that not all build objects seem to be properly regenerated. Everything builds and links fine, but right after this commit I got some double free corruption kinds of errors...

Confirmed, the Travis build job that attempts exporting a project crashed: https://travis-ci.org/godotengine/godot/jobs/634336490?utm_medium=notification&utm_source=github_status
I'll clear the cache to get a build from scratch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant