Merge pull request #69169 from akien-mga/embree-wasm-win32

embree: Enable raycast module build for Web and Windows x86_32

2 files changed, 14 insertions, 7 deletions

diff --git a/modules/raycast/SCsub b/modules/raycast/SCsub
index 20b05816e1..51d75d45b0 100644
--- a/modules/raycast/SCsub
+++ b/modules/raycast/SCsub
@@ -67,7 +67,7 @@ if env["builtin_embree"]:
     env_raycast.AppendUnique(CPPDEFINES=["NDEBUG"])  # No assert() even in debug builds.
 
     if not env.msvc:
-        if env["arch"] == "x86_64":
+        if env["arch"] in ["x86_64", "x86_32"]:
             env_raycast.Append(CPPFLAGS=["-msse2", "-mxsave"])
 
         if env["platform"] == "windows":
@@ -87,10 +87,13 @@ if env["builtin_embree"]:
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 
-    if env["arch"] == "arm64" or env.msvc:
+    if env["arch"] != "x86_64" or env.msvc:
         # Embree needs those, it will automatically use SSE2NEON in ARM
         env_thirdparty.Append(CPPDEFINES=["__SSE2__", "__SSE__"])
 
+    if env["platform"] == "web":
+        env_thirdparty.Append(CPPFLAGS=["-msimd128"])
+
     if not env.msvc:
         env_thirdparty.Append(
             CPPFLAGS=[
diff --git a/modules/raycast/config.py b/modules/raycast/config.py
index 833ad50018..f4243f01c5 100644
--- a/modules/raycast/config.py
+++ b/modules/raycast/config.py
@@ -1,9 +1,13 @@
 def can_build(env, platform):
-    # Depends on Embree library, which only supports x86_64 and arm64.
-    if platform == "windows":
-        return env["arch"] == "x86_64"  # TODO build for Windows on ARM
-
-    return env["arch"] in ["x86_64", "arm64"]
+    # Supported architectures depend on the Embree library.
+    # No ARM32 support planned.
+    if env["arch"] == "arm32":
+        return False
+    # x86_32 only seems supported on Windows for now.
+    if env["arch"] == "x86_32" and platform != "windows":
+        return False
+    # The rest works, even wasm32!
+    return True
 
 
 def configure(env):