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

Fix macOS and Windows build with statically linked ANGLE/EGL. #83988

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Fix macOS and Windows build with statically linked ANGLE/EGL. #83988

merged 1 commit into from
Oct 26, 2023

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Oct 26, 2023

Fixes macOS and Windows build after #83930, static ANGLE always include EGL 1.5 and does not use GLAD to load it therefore GLAD_EGL_VERSION_1_5 is undefined.

@akien-mga akien-mga added this to the 4.2 milestone Oct 26, 2023
Riteo
Riteo approved these changes Oct 26, 2023
View reviewed changes
Copy link
Contributor

@Riteo Riteo left a comment

Choose a reason for hiding this comment

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

Oops, I forgot about static EGL when reviewing the last PR xD

@akien-mga akien-mga merged commit 46cb7f9 into godotengine:master Oct 26, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@bruvzg bruvzg deleted the egl_static branch October 26, 2023 10:31
@aitorciki aitorciki mentioned this pull request Oct 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Riteo Riteo Riteo approved these changes

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
bug platform:macos platform:windows regression topic:porting
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.
3 participants
@bruvzg @akien-mga @Riteo