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: Extend MinGW support & checks #98105

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

Repiteo
Copy link
Contributor

@Repiteo Repiteo commented Oct 11, 2024

Extended logic for MinGW, primarily accounting for MSYS2/Cygwin not wanting to cooperate. Honestly, we might just want a blanket warning regarding MSYS2/Cygwin in the future; their MinGW implementations can be really troublesome. That aside, this PR also implements the explicit mingw Tool from SCons; consequently, there's now a means of natively generating res files, so the previous dedicated build function was removed

@akien-mga
Copy link
Member

Code looks pretty clean to me, it's a nice improvement.

This logic is pretty brittle and there's a myriad of mingw distributions, so we need to make sure this is well tested:

  • mingw-gcc on Linux
  • mingw-gcc on macOS
  • llvm-mingw on Windows, Linux, macOS
  • MSYS2 on Windows
  • scoop installed mingw on Windows
  • more?

We might not need to test everything if a few are tested and work and the code logic itself seems sound.

CC @bruvzg

@bruvzg bruvzg self-requested a review November 5, 2024 11:47
Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

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

Changes looks fine.

Tested with:

  • GCC on macOS (brew install)
  • LLVM on macOS (standalone mstorsjo/llvm-mingw)
  • GCC/MSYS2 on Windows
  • GCC on Windows (scoop install)
  • LLVM on Windows (standalone mstorsjo/llvm-mingw)

Linux MinGW installs depends on distro, but should more or less behave the same as on macOS.

@Repiteo Repiteo merged commit fa65b70 into godotengine:master Nov 7, 2024
20 checks passed
@Repiteo Repiteo deleted the scons/mingw-shenanigans branch November 7, 2024 18:38
akien-mga added a commit to akien-mga/godot that referenced this pull request Nov 8, 2024
This old hack is no longer needed and now wrong after godotengine#98105.

Fixes godotengine#98967.
jss2a98aj pushed a commit to jss2a98aj/blazium that referenced this pull request Dec 7, 2024
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