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

Fix is_msvc and use_hot_reload variables #1303

Merged

Conversation

Repiteo
Copy link
Contributor

@Repiteo Repiteo commented Nov 6, 2023

Extracted from #1289
Fixes #1297

Fixes two variables that weren't loading their values correctly: is_msvc and use_hot_reload. The former didn't properly apply to disable_exceptions because it was previously evaluated before the windows target was parsed, so the expression was relocated with no further changes. The latter failed to evaluate the conditional properly, even if a value was provided via cla, so its fallback was changed to None & the logic was migrated to just before the variable is first used.

@Repiteo Repiteo requested a review from a team as a code owner November 6, 2023 16:54
@dsnopek dsnopek added bug This has been identified as a bug topic:buildsystem Related to the buildsystem or CI setup cherrypick:4.1 labels Nov 8, 2023
@dsnopek dsnopek added this to the 4.x milestone Nov 8, 2023
Copy link
Collaborator

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good to me :-)

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.

Makes sense.

@akien-mga akien-mga merged commit 4af4613 into godotengine:master Nov 9, 2023
12 checks passed
@akien-mga
Copy link
Member

Thanks!

@Repiteo Repiteo deleted the is_msvc-and-use_hot_reload-fix branch November 9, 2023 16:32
@dsnopek
Copy link
Collaborator

dsnopek commented Nov 10, 2023

Cherry-picked for 4.1 in PR #1306

@dsnopek dsnopek mentioned this pull request Nov 10, 2023
@akien-mga akien-mga modified the milestones: 4.x, 4.2 Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This has been identified as a bug topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

msvc builds cause warning c4530
3 participants