Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Win/UWP support #4119

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions starboard/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,8 @@ group("gn_all") {
deps += [
"//starboard/shared/starboard/player/filter/testing:player_filter_tests($starboard_toolchain)",
"//starboard/shared/starboard/player/filter/testing:player_filter_tests_install($starboard_toolchain)",
"//starboard/shared/starboard/player/filter/tools:audio_dmp_player($starboard_toolchain)",
]

# TODO: b/296715826 - Fix build error for windows modular builds.
if (!(sb_is_modular && host_os == "win")) {
deps += [ "//starboard/shared/starboard/player/filter/tools:audio_dmp_player($starboard_toolchain)" ]
}
}

if (sb_enable_benchmark) {
Expand Down Expand Up @@ -141,7 +137,7 @@ group("starboard_group") {
}

# TODO: b/295702296 Fix libunwind for modular builds.
if (sb_is_evergreen || host_os == "win") {
if (sb_is_evergreen) {
public_deps += [ "//third_party/llvm-project/libunwind:unwind" ]
}
} else {
Expand Down
24 changes: 0 additions & 24 deletions starboard/build/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,6 @@ config("host") {
ldflags += [ "-m32" ]
}
}
} else if (is_win) {
# A few flags to mute MSVC compiler errors that does not appear on Linux.
cflags = [
"/wd4267", # Possible loss of precision from size_t to a smaller type.
"/wd4715", # Not all control paths return value.
]
configs = [ ":win_cpp17_config" ]
} else if (is_apple) {
configs = [ ":apple_cpp17_config" ]
}
Expand Down Expand Up @@ -269,9 +262,6 @@ config("no_pedantic_warnings") {
}

config("warnings_as_errors") {
if (is_win && treat_warnings_as_errors) {
cflags = [ "/WX" ]
}
}

# This config is defined here and added as a default config so that the flags
Expand All @@ -293,9 +283,6 @@ config("default_cpp_standard") {
if (current_toolchain == default_toolchain) {
if (sb_is_modular || is_android) {
configs = [ ":modular_cpp17_config" ]
} else if (host_os == "win") {
# These flags apply to non-modular windows platforms which includes win32, xb1.
configs = [ ":win_cpp17_config" ]
} else if (is_linux) {
configs = [ ":linux_non_modular_cpp17_config" ]
} else if (is_apple) {
Expand All @@ -312,9 +299,6 @@ config("cpp20_supported_config") {
if (current_toolchain == default_toolchain) {
if (sb_is_modular || is_android) {
configs = [ ":modular_cpp20_config" ]
} else if (host_os == "win") {
# These flags apply to non-modular windows platforms which includes win32, xb1.
configs = [ ":win_cpp20_config" ]
} else if (is_linux) {
configs = [ ":linux_non_modular_cpp20_config" ]
} else if (is_apple) {
Expand All @@ -327,14 +311,6 @@ config("cpp20_supported_config") {
}
}

config("win_cpp17_config") {
cflags = [ "/std:c++17" ]
}

config("win_cpp20_config") {
cflags = [ "/std:c++20" ]
}

config("apple_cpp17_config") {
cflags_cc = [ "-std=gnu++17" ]
cflags_objcc = [ "-std=gnu++17" ]
Expand Down
20 changes: 6 additions & 14 deletions starboard/build/config/BUILDCONFIG.gn
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,6 @@ if (is_qa || is_gold || sb_use_no_rtti) {
default_compiler_configs += [ "//build/config/compiler:no_rtti" ]
}

if (is_win) {
default_compiler_configs += [ "//build/config/win:lean_and_mean" ]
}

if (is_native_target_build) {
default_compiler_configs += [ "//starboard/build/config:native_target" ]
}
Expand Down Expand Up @@ -538,11 +534,9 @@ template("shared_library") {
forward_variables_from(invoker, [ "testonly" ])
deps = [
":${actual_target_name}_loader($starboard_toolchain)",
":${actual_target_name}_loader_copy($starboard_toolchain)",
":${actual_target_name}_loader_install($starboard_toolchain)",
]
if (host_os != "win") {
deps += [ ":${actual_target_name}_loader_copy($starboard_toolchain)" ]
}
}
if (current_toolchain == starboard_toolchain) {
executable("${actual_target_name}_loader") {
Expand Down Expand Up @@ -588,13 +582,11 @@ template("shared_library") {
deps += [ "//starboard:starboard_install($starboard_toolchain)" ]
}
}
if (host_os != "win") {
copy("${actual_target_name}_loader_copy") {
forward_variables_from(invoker, [ "testonly" ])
sources = [ "$root_out_dir/${actual_target_name}_loader" ]
outputs = [ "$root_build_dir/${actual_target_name}_loader" ]
deps = [ ":${actual_target_name}_loader" ]
}
copy("${actual_target_name}_loader_copy") {
forward_variables_from(invoker, [ "testonly" ])
sources = [ "$root_out_dir/${actual_target_name}_loader" ]
outputs = [ "$root_build_dir/${actual_target_name}_loader" ]
deps = [ ":${actual_target_name}_loader" ]
}
}
}
Expand Down
5 changes: 1 addition & 4 deletions starboard/build/config/modular/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ config("modular") {
"-isystem" + rebase_path("//third_party/musl/arch/generic", root_build_dir),
]

if (host_os != "win") {
# Causes error on windows. clang++: error: unsupported option '-fPIC' for target 'x86_64-pc-windows-msvc'
cflags += [ "-fPIC" ]
}
cflags += [ "-fPIC" ]

cflags_cc = [ "-nostdinc++" ]

Expand Down
4 changes: 1 addition & 3 deletions starboard/build/config/starboard_target_type.gni
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ template("starboard_platform_target") {
}
if (target_type == "shared_library") {
build_loader = false
if (host_os != "win") {
output_extension = starboard_shared_library_extension
}
output_extension = starboard_shared_library_extension
}
public_deps = [
"//starboard/client_porting/cwrappers",
Expand Down
Loading
Loading