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

embree: Allow building against system library on Linux #48073

Merged
merged 1 commit into from
Apr 22, 2021
Merged

embree: Allow building against system library on Linux #48073

merged 1 commit into from
Apr 22, 2021

Conversation

akien-mga
Copy link
Member

Tested on my distro Mageia, I could successfully link against system-packaged lib64embree3-devel-3.12.1-1.mga8 which seems to be the same version we vendor (and our patches are only for Windows/MinGW support).

@akien-mga akien-mga added this to the 3.4 milestone Apr 22, 2021
@akien-mga akien-mga requested a review from JFonS April 22, 2021 00:06
@akien-mga akien-mga requested review from a team as code owners April 22, 2021 00:06
@akien-mga akien-mga marked this pull request as draft April 22, 2021 00:23
@akien-mga
Copy link
Member Author

Actually doesn't work with a build from scratch as the common/math stuff from Embree is not part of the public headers it seems, yet we rely on them:

modules/raycast/lightmap_raycaster.cpp:34:10: fatal error: math/vec2.h: No such file or directory
   34 | #include <math/vec2.h>
      |          ^~~~~~~~~~~~~

@JFonS
Copy link
Contributor

JFonS commented Apr 22, 2021

I think I can get rid of those imports, I will take a look.

@JFonS JFonS mentioned this pull request Apr 22, 2021
Merged
@akien-mga akien-mga marked this pull request as ready for review April 22, 2021 15:07
@akien-mga
Copy link
Member Author

Rebased after #48089 and removed thirdparty/embree/common from the include path. Seems to work fine locally with both vendored and system Embree.

@akien-mga akien-mga merged commit b1898c7 into godotengine:3.x Apr 22, 2021
@akien-mga akien-mga deleted the 3.x-unbundle-embree branch April 22, 2021 16:06
@akien-mga
Copy link
Member Author

Cherry-picked for 3.3.1.

@akien-mga akien-mga mentioned this pull request Apr 22, 2021
Merged
@akien-mga akien-mga mentioned this pull request Apr 23, 2021
Merged
akien-mga added a commit to akien-mga/godot that referenced this pull request Apr 23, 2021
@akien-mga
Linux: Don't attempt linking embree3 on non-tools, link it for headle…
a14b51d 
…ss too

`tech_debt++`, that's what we get for not taking the time to cleanup all this
and do it right...

Follow-up to godotengine#48073 and godotengine#48102.
akien-mga added a commit that referenced this pull request Apr 23, 2021
@akien-mga
Linux: Don't attempt linking embree3 on non-tools, link it for headle…
162c78f 
…ss too

`tech_debt++`, that's what we get for not taking the time to cleanup all this
and do it right...

Follow-up to #48073 and #48102.

(cherry picked from commit a14b51d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JFonS JFonS Awaiting requested review from JFonS

Assignees
No one assigned
Labels
enhancement platform:linuxbsd topic:buildsystem topic:thirdparty
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.
2 participants
@akien-mga @JFonS