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

[3.x] Improve architectures in OS::has_feature and make it work on MSVC #61740

Merged
merged 1 commit into from
Jun 6, 2022

Conversation

aaronfranke
Copy link
Member

@aaronfranke aaronfranke commented Jun 6, 2022

This is the same as #61732 except it doesn't change the behavior of the existing x86 and arm defines (in 3.x and in this PR, they will only be true for 32-bit).

Note: wasm64 is for future-proofing, it doesn't exist yet even in master. Inevitably it will come eventually. I don't know if wasm64 support will be backported to 3.x when it does come to master, but it doesn't hurt to leave this code in here.

3.4 backport (assuming we want to backport further): https://github.com/aaronfranke/godot/tree/3.4-arch-os-feature

@akien-mga akien-mga modified the milestones: 3.x, 3.5 Jun 6, 2022
@akien-mga akien-mga merged commit b48a589 into godotengine:3.x Jun 6, 2022
@akien-mga
Copy link
Member

Thanks!

@aaronfranke aaronfranke deleted the 3.x-arch-os-feature branch June 6, 2022 16:15
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.

2 participants