godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Remove server platform

Browse Source
This commit is contained in:
Fabio Alessandrelli
2021-05-25 16:17:08 +02:00
parent 801aadb401
commit ae04dac2db
11 changed files with 17 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/text_server_adv/SCsub
View File

@@ -131,7 +131,7 @@ if env["builtin_harfbuzz"]:
]
)
if env["platform"] == "android" or env["platform"] == "linuxbsd" or env["platform"] == "server":
if env["platform"] == "android" or env["platform"] == "linuxbsd":
env_harfbuzz.Append(CCFLAGS=["-DHAVE_PTHREAD"])
if env["platform"] == "javascript":

9
modules/webm/libvpx/SCsub
View File

@@ -235,7 +235,7 @@ if env["platform"] == "uwp":
else:
import platform
is_x11_or_server_arm = (env["platform"] == "linuxbsd" or env["platform"] == "server") and (
is_x11_or_server_arm = env["platform"] == "linuxbsd" and (
platform.machine().startswith("arm") or platform.machine().startswith("aarch")
)
is_macos_x86 = env["platform"] == "osx" and ("arch" in env and (env["arch"] != "arm64"))
@@ -314,12 +314,7 @@ if webm_cpu_x86:
if webm_cpu_arm:
if env["platform"] == "iphone":
env_libvpx["ASFLAGS"] = "-arch armv7"
elif (
env["platform"] == "android"
and env["android_arch"] == "armv7"
or env["platform"] == "linuxbsd"
or env["platform"] == "server"
):
elif env["platform"] == "android" and env["android_arch"] == "armv7" or env["platform"] == "linuxbsd":
env_libvpx["ASFLAGS"] = "-mfpu=neon"
elif env["platform"] == "uwp":
env_libvpx["AS"] = "armasm"