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

Remove duplicate ASTC encoder code. #13

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Jul 29, 2024

@@ -489,29 +489,6 @@ angle_sources = [
"third_party/zlib/trees.c",
"third_party/zlib/uncompr.c",
"third_party/zlib/zutil.c",
Copy link
Member

Choose a reason for hiding this comment

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

Is there any risk of similar symbol clashes with zlib?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it should not conflict. ANGLE zlib is modified to use custom _Cr_z prefix (and seems to have other ANGLE specific changes).

@akien-mga akien-mga merged commit e63c157 into godotengine:godot-static Jul 30, 2024
14 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash on macOS when importing textures with specific settings
2 participants