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.

Sign up for GitHub

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

Jump to bottom

Add support for LLVM/MinGW and ARM64 Windows builds. #1535

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Add support for LLVM/MinGW and ARM64 Windows builds. #1535

merged 1 commit into from
Sep 10, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Jul 26, 2024

Similar to the recent https://github.com/bruvzg/godot-nir-static/ and https://github.com/bruvzg/godot-angle-static/ changes for ARM64 Windows support.

  • Fixes MSVC architecture detection.
  • Adds MinGW-LLVM support.
  • Adds mingw_prefix to specify custom toolchain.

Tested with:

  • MSVC 2022 - (arm64, x86_64, x86_32)
  • MinGW-GCC MSYS2 on Windows - (x86_64, x86_32)
  • MinGW-LLVM on Windows - (arm64, x86_64, x86_32)
  • MinGW-GCC cross build from macOS - (x86_64)
  • MinGW-LLVM cross build from macOS - (x86_64)

@bruvzg bruvzg added enhancement This is an enhancement on the current functionality platform:windows topic:buildsystem Related to the buildsystem or CI setup labels Jul 26, 2024
@bruvzg bruvzg requested a review from a team as a code owner July 26, 2024 06:41
@bruvzg bruvzg force-pushed the llvm-mingw-arm64 branch 3 times, most recently from 7242aa2 to fdcfade Compare July 26, 2024 06:46
dsnopek
dsnopek reviewed Aug 7, 2024
View reviewed changes
tools/windows.py Outdated Show resolved Hide resolved
dsnopek
dsnopek approved these changes Sep 10, 2024
View reviewed changes
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! I don't have a way to test this, but it looks good to me

@dsnopek dsnopek merged commit 4d8c05f into godotengine:master Sep 10, 2024
12 checks passed
@dsnopek
Copy link
Collaborator

dsnopek commented Oct 28, 2024

Cherry-picked for 4.2 in PR #1631

@dsnopek
Copy link
Collaborator

dsnopek commented Oct 28, 2024

Cherry-picked for 4.3 in PR #1632

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsnopek dsnopek dsnopek approved these changes

Assignees
No one assigned
Labels
enhancement This is an enhancement on the current functionality platform:windows topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bruvzg @dsnopek