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

SCons: Fix output with vsproj=yes #93753

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

Repiteo
Copy link
Contributor

@Repiteo Repiteo commented Jun 29, 2024

A handful of tweaks/fixes all related to passing vsproj=yes to SCons:

  • Ensure *.vcsproj.filters has a designated section for "Other Files". On live, the files designated to it (.glsl, .natvis) wouldn't appear at all1.
  • Ensure *.sln is written with CRLF line-endings.
  • Fix comment giving the wrong input for generating & building from cl.
  • Expand cpp.hint defines to include GDVIRTUAL, EXBIND, and MODBIND.
  • Generate cpp.hint before vsproj; previously wouldn't get built at all unless vsproj_gen_only=no.

Footnotes

  1. https://chat.godotengine.org/channel/buildsystem?msg=krbx6pCcdAFBczb9T

@Repiteo Repiteo added this to the 4.3 milestone Jun 29, 2024
@Repiteo Repiteo requested a review from a team as a code owner June 29, 2024 18:14
@ChristopheClaustre
Copy link
Contributor

As said in godot contributors chat, .glsl files were not referenced in the vs solution.
I confirm that thanks to this PR, they are now.

I can't say for the other aspect of this PR.

@akien-mga
Copy link
Member

CC @shana

@akien-mga akien-mga merged commit 4e5ed0b into godotengine:master Jul 22, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks!

@Repiteo Repiteo deleted the scons/visual-studio-fixes branch July 22, 2024 15:30
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.

3 participants