Skip to content

Commit 17a8126

Browse files
committed
Merge pull request godotengine#91684 from Chubercik/embree4_aftermath
Fix `builtin_embree=no` build linking the wrong version of Embree
2 parents 4c30718 + 7699d67 commit 17a8126

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/math/static_raycaster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class StaticRaycaster : public RefCounted {
4949
static StaticRaycaster *(*create_function)();
5050

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

platform/linuxbsd/detect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def configure(env: "SConsEnvironment"):
309309

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

314314
if not env["builtin_openxr"]:
315315
env.ParseConfig("pkg-config openxr --cflags --libs")

scene/3d/lightmapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class LightmapRaycaster : public RefCounted {
6161
static LightmapRaycaster *(*create_function)();
6262

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

0 commit comments

Comments
 (0)