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

[Windows] Rename PKEY_Device_FriendlyName to avoid duplicate symbols with newer MinGW SDKs. #99036

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Nov 10, 2024

Renames CLSID constant to avoid conflicts, since it is defined only in some SDK versions (same way we handle CLSID for DX12).

Fixes #97882
Fixes #98822

@bruvzg bruvzg added this to the 4.4 milestone Nov 10, 2024
@bruvzg bruvzg requested a review from a team as a code owner November 10, 2024 19:48
Copy link
Member

@fire fire left a comment

Choose a reason for hiding this comment

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

I am affected

@Anutrix
Copy link
Contributor

Anutrix commented Nov 16, 2024

Also affected here.
Can we please get this merged since it is approved?

@roalyr
Copy link

roalyr commented Nov 30, 2024

Should fix #98822 as well. Waiting for it to compile fork with double precision.

@akien-mga akien-mga added the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Dec 2, 2024
@akien-mga akien-mga added cherrypick:4.1 cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release labels Dec 2, 2024
@akien-mga akien-mga merged commit 101b741 into godotengine:master Dec 2, 2024
20 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release platform:windows topic:buildsystem
Projects
None yet
5 participants