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

Haiku: Remove remnants of past WIP platform port #81420

Merged
merged 1 commit into from
Sep 7, 2023
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
2 changes: 1 addition & 1 deletion drivers/gl_context/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Import("env")

if env["platform"] in ["haiku", "macos", "windows", "linuxbsd"]:
if env["platform"] in ["macos", "windows", "linuxbsd"]:
# Thirdparty source files
thirdparty_dir = "#thirdparty/glad/"
thirdparty_sources = [
Expand Down
4 changes: 2 additions & 2 deletions modules/mono/build_scripts/mono_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@


def is_desktop(platform):
return platform in ["windows", "macos", "linuxbsd", "haiku"]
return platform in ["windows", "macos", "linuxbsd"]


def is_unix_like(platform):
return platform in ["macos", "linuxbsd", "android", "haiku", "ios"]
return platform in ["macos", "linuxbsd", "android", "ios"]


def module_supports_tools_on(platform):
Expand Down
4 changes: 2 additions & 2 deletions modules/mono/config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "android", "haiku", "web", "ios"]
# Eventually support for each them should be added back (except Haiku if not supported by .NET Core)
# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "android", "web", "ios"]
# Eventually support for each them should be added back.
supported_platforms = ["windows", "macos", "linuxbsd", "android"]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'windows' ">GODOT_WINDOWS;GODOT_PC</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'linuxbsd' ">GODOT_LINUXBSD;GODOT_PC</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'macos' ">GODOT_OSX;GODOT_MACOS;GODOT_PC</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'haiku' ">GODOT_HAIKU;GODOT_PC</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'android' ">GODOT_ANDROID;GODOT_MOBILE</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'ios' ">GODOT_IPHONE;GODOT_IOS;GODOT_MOBILE</GodotPlatformConstants>
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'web' ">GODOT_JAVASCRIPT;GODOT_HTML5;GODOT_WASM;GODOT_WEB</GodotPlatformConstants>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,6 @@ private static string GetMonoCrossDesktopDirName(string platform, string arch)
{
return $"linux-{arch}";
}
case OS.Platforms.Haiku:
{
return $"{platform}-{arch}";
}
default:
throw new NotSupportedException($"Platform not supported: {platform}");
}
Expand Down
9 changes: 1 addition & 8 deletions modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ private static class Names
public const string FreeBSD = "FreeBSD";
public const string NetBSD = "NetBSD";
public const string BSD = "BSD";
public const string Haiku = "Haiku";
public const string Android = "Android";
public const string iOS = "iOS";
public const string Web = "Web";
Expand All @@ -40,7 +39,6 @@ public static class Platforms
public const string Windows = "windows";
public const string MacOS = "macos";
public const string LinuxBSD = "linuxbsd";
public const string Haiku = "haiku";
public const string Android = "android";
public const string iOS = "ios";
public const string Web = "web";
Expand Down Expand Up @@ -69,7 +67,6 @@ public static class DotNetOS
["Windows"] = Platforms.Windows,
["macOS"] = Platforms.MacOS,
["Linux"] = Platforms.LinuxBSD,
["Haiku"] = Platforms.Haiku,
["Android"] = Platforms.Android,
["iOS"] = Platforms.iOS,
["Web"] = Platforms.Web
Expand All @@ -83,7 +80,6 @@ public static class DotNetOS
[Names.FreeBSD] = Platforms.LinuxBSD,
[Names.NetBSD] = Platforms.LinuxBSD,
[Names.BSD] = Platforms.LinuxBSD,
[Names.Haiku] = Platforms.Haiku,
[Names.Android] = Platforms.Android,
[Names.iOS] = Platforms.iOS,
[Names.Web] = Platforms.Web
Expand Down Expand Up @@ -127,13 +123,12 @@ private static bool IsAnyOS(IEnumerable<string> names)
new[] { Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD };

private static readonly IEnumerable<string> UnixLikePlatforms =
new[] { Names.MacOS, Names.Haiku, Names.Android, Names.iOS }
new[] { Names.MacOS, Names.Android, Names.iOS }
.Concat(LinuxBSDPlatforms).ToArray();

private static readonly Lazy<bool> _isWindows = new(() => IsOS(Names.Windows));
private static readonly Lazy<bool> _isMacOS = new(() => IsOS(Names.MacOS));
private static readonly Lazy<bool> _isLinuxBSD = new(() => IsAnyOS(LinuxBSDPlatforms));
private static readonly Lazy<bool> _isHaiku = new(() => IsOS(Names.Haiku));
private static readonly Lazy<bool> _isAndroid = new(() => IsOS(Names.Android));
private static readonly Lazy<bool> _isiOS = new(() => IsOS(Names.iOS));
private static readonly Lazy<bool> _isWeb = new(() => IsOS(Names.Web));
Expand All @@ -145,8 +140,6 @@ private static bool IsAnyOS(IEnumerable<string> names)

[SupportedOSPlatformGuard("linux")] public static bool IsLinuxBSD => _isLinuxBSD.Value;

public static bool IsHaiku => _isHaiku.Value;

[SupportedOSPlatformGuard("android")] public static bool IsAndroid => _isAndroid.Value;

[SupportedOSPlatformGuard("ios")] public static bool IsiOS => _isiOS.Value;
Expand Down
1 change: 0 additions & 1 deletion modules/mono/godotsharp_dirs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ static const char *platform_name_map[][2] = {
{ "FreeBSD", "linuxbsd" },
{ "NetBSD", "linuxbsd" },
{ "BSD", "linuxbsd" },
{ "Haiku", "haiku" },
{ "Android", "android" },
{ "iOS", "ios" },
{ "Web", "web" },
Expand Down