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 builtin_embree=no build linking the wrong version of Embree #91684

Merged
merged 1 commit into from
May 8, 2024
Merged

Fix builtin_embree=no build linking the wrong version of Embree #91684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/math/static_raycaster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class StaticRaycaster : public RefCounted {
static StaticRaycaster *(*create_function)();

public:
// compatible with embree3 rays
// Compatible with embree4 rays.
struct __aligned(16) Ray {
const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h

Expand Down
2 changes: 1 addition & 1 deletion platform/linuxbsd/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def configure(env: "SConsEnvironment"):

if not env["builtin_embree"] and env["arch"] in ["x86_64", "arm64"]:
# No pkgconfig file so far, hardcode expected lib name.
env.Append(LIBS=["embree3"])
env.Append(LIBS=["embree4"])

if not env["builtin_openxr"]:
env.ParseConfig("pkg-config openxr --cflags --libs")
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/lightmapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class LightmapRaycaster : public RefCounted {
static LightmapRaycaster *(*create_function)();

public:
// compatible with embree3 rays
// Compatible with embree4 rays.
struct __aligned(16) Ray {
const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h

Expand Down