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.2.4] embree: import cross compile fixes. #45284

Closed
wants to merge 1 commit into from

Conversation

lyuma
Copy link
Contributor

@lyuma lyuma commented Jan 18, 2021

Fix typos in #if and nonstandard implicit cast.
Collectively, these two fixes allow embree to be cross compiled using llvm-mingw on Linux:
Note that in addition to fixing the typo with _MSC_VER, the defined check must be added to avoid undefined symbols acting as 0.
See RenderKit/embree#310

(Originally posted at @JFonS repo at JFonS#4 : It was later partially addressed, but the typo in the _MSC_VER macro was not fixed.)

@akien-mga
Copy link
Member

akien-mga commented Jan 18, 2021

These changes should be added to thirdparty/embree/pathces/godot-changes.patch (and the folder name should be fixed while at it) to document our thirdparty changes.

Would this possibly solve #45097 with MinGW GCC too?

Fix typos in #if; add missing _MSC_VER; avoid warning in random generator.
@lyuma
Copy link
Contributor Author

lyuma commented Jan 18, 2021

It turns out that I also included this change in #45285 when updating the godot-changes.patch, so I'm closing this redundant issue: sorry for the trouble.

@lyuma lyuma closed this Jan 18, 2021
@lyuma lyuma deleted the lightmapper_mscver_fix branch January 18, 2021 15:47
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Apr 20, 2021
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