瀏覽代碼

SCons: Disable embree-based modules on x86 (32-bit)

Fixes #48482.

(cherry picked from commit e53422c8f96770c9a9b7497955c84f4b742fdd73)
Rémi Verschelde 4 年之前
父節點
當前提交
b97b37f91c
共有 2 個文件被更改,包括 11 次插入2 次删除
  1. 4 1
      modules/lightmapper_cpu/config.py
  2. 7 1
      modules/raycast/config.py

+ 4 - 1
modules/lightmapper_cpu/config.py

@@ -7,11 +7,14 @@ def can_build(env, platform):
     # solution.
 
     if platform == "android":
-        return env["android_arch"] in ["arm64v8", "x86", "x86_64"]
+        return env["android_arch"] in ["arm64v8", "x86_64"]
 
     if platform in ["javascript", "server"]:
         return False
 
+    if env["bits"] == "32":
+        return False
+
     return True
 
 

+ 7 - 1
modules/raycast/config.py

@@ -2,12 +2,18 @@ def can_build(env, platform):
     if not env["tools"]:
         return False
 
+    # Depends on Embree library, which supports only x86_64 (originally)
+    # and aarch64 (thanks to the embree-aarch64 fork).
+
     if platform == "android":
-        return env["android_arch"] in ["arm64v8", "x86", "x86_64"]
+        return env["android_arch"] in ["arm64v8", "x86_64"]
 
     if platform in ["javascript", "server"]:
         return False
 
+    if env["bits"] == "32":
+        return False
+
     return True