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

[MinGW] Remove unused WinAPI includes/defines from RVO2. #36102

Merged
merged 1 commit into from
Feb 11, 2020

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Feb 11, 2020

Remove unused and conflicting WinAPI defines to fix MinGW cross-build, and unused RVO.h header (part of RVOSimulator).

Fixes #34776 (comment).
Fixes #36104.

@Calinou
Copy link
Member

Calinou commented Feb 11, 2020

If relevant, could this be sent upstream as well if it's still active?

@AndreaCatania
Copy link
Contributor

Are you sure that this doesn't lead to incorrect RVO behaviour on Windows?

@bruvzg
Copy link
Member Author

bruvzg commented Feb 11, 2020

If relevant, could this be sent upstream as well if it's still active?

It's last update in 2016.

Are you sure that this doesn't lead to incorrect RVO behaviour on Windows?

I have tested demo project form the #34776 top comment on macOS and Windows and didn't notice any difference.

SDKDDKVer.h - used to define _WIN32_WINNT, that's already defined by Godot build config.
NOMINMAX - disables deprecated macros, already defined by Godot build config.
windows.h with significant portion of it disabled by WIN32_LEAN_AND_MEAN and NOxxx - not sure why it's there.
__declspec()s - only used if RVO is built as Windows .dll.
_USE_MATH_DEFINES - used to define M_ constants, but non of these are used in the RVO.

@akien-mga akien-mga merged commit 8c73e81 into godotengine:master Feb 11, 2020
@akien-mga
Copy link
Member

Thanks!

@bruvzg bruvzg deleted the rvo2_mingw_fix branch February 11, 2020 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants