Skip to content

Commit

Permalink
Remove server platform
Browse files Browse the repository at this point in the history
  • Loading branch information
Faless committed Jun 1, 2021
1 parent 801aadb commit ae04dac
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 816 deletions.
27 changes: 13 additions & 14 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -665,20 +665,19 @@ if selected_platform in platform_list:
if not env["verbose"]:
methods.no_verbose(sys, env)

if not env["platform"] == "server":
GLSL_BUILDERS = {
"RD_GLSL": env.Builder(
action=env.Run(glsl_builders.build_rd_headers, 'Building RD_GLSL header: "$TARGET"'),
suffix="glsl.gen.h",
src_suffix=".glsl",
),
"GLSL_HEADER": env.Builder(
action=env.Run(glsl_builders.build_raw_headers, 'Building GLSL header: "$TARGET"'),
suffix="glsl.gen.h",
src_suffix=".glsl",
),
}
env.Append(BUILDERS=GLSL_BUILDERS)
GLSL_BUILDERS = {
"RD_GLSL": env.Builder(
action=env.Run(glsl_builders.build_rd_headers, 'Building RD_GLSL header: "$TARGET"'),
suffix="glsl.gen.h",
src_suffix=".glsl",
),
"GLSL_HEADER": env.Builder(
action=env.Run(glsl_builders.build_raw_headers, 'Building GLSL header: "$TARGET"'),
suffix="glsl.gen.h",
src_suffix=".glsl",
),
}
env.Append(BUILDERS=GLSL_BUILDERS)

scons_cache_path = os.environ.get("SCONS_CACHE")
if scons_cache_path != None:
Expand Down
2 changes: 1 addition & 1 deletion drivers/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SConscript("coremidi/SCsub")
SConscript("winmidi/SCsub")

# Graphics drivers
if env["platform"] != "server" and env["platform"] != "javascript":
if env["platform"] != "javascript":
SConscript("vulkan/SCsub")
else:
SConscript("dummy/SCsub")
Expand Down
2 changes: 1 addition & 1 deletion modules/text_server_adv/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
9 changes: 2 additions & 7 deletions modules/webm/libvpx/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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"
Expand Down
16 changes: 0 additions & 16 deletions platform/server/SCsub

This file was deleted.

296 changes: 0 additions & 296 deletions platform/server/detect.py

This file was deleted.

Loading

0 comments on commit ae04dac

Please sign in to comment.