Merge pull request #48483 from akien-mga/3.x-embree-not-on-x86
SCons: Disable embree-based modules on x86 (32-bit)
This commit is contained in:
commit
78b497bf20
2 changed files with 11 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue