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] Add main executable to the console wrapper dependencies to prevent simultaneous linking. #80918

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Aug 23, 2023

Should fix #80482 (comment)

@bruvzg bruvzg added this to the 4.2 milestone Aug 23, 2023
@bruvzg bruvzg requested a review from a team as a code owner August 23, 2023 07:01
@YuriSizov
Copy link
Contributor

cc @darksylinc @anvilfolk Could you give it a test and see if this PR resolves your issue?

@anvilfolk
Copy link
Contributor

I compiled from scratch twice on the computer that was having trouble pretty regularly and it worked fine! It's not a 100% guarantee, but it is a good indicator that this fix might work! :)

@anvilfolk
Copy link
Contributor

Three more successful compilations with no issues whatsoever. I'd say merge :)

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@YuriSizov YuriSizov merged commit d476cdf into godotengine:master Aug 25, 2023
@YuriSizov
Copy link
Contributor

Thanks!

@akien-mga akien-mga added 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:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release and removed 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 labels Aug 28, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 20, 2023
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.

4 participants