izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge to Dev-Main for 4.20 @ 4090813

Browse Source 
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
This commit is contained in:
Marc Audy
2018-05-23 21:04:31 -04:00
parent d25270fdea
commit d90da4ab1a
2547 changed files with 100433 additions and 102532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Developer/DesktopPlatform/Private/PlatformInfo.cpp
+13 -16
View File
@@ -133,7 +133,7 @@ static const FPlatformInfo AllPlatformInfoArray[] = {
BuildPlatformInfo(TEXT("AllDesktop"), TEXT("AllDesktop"), LOCTEXT("DesktopTargetPlatDisplay", "Desktop (Win+Mac+Linux)"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/Desktop/Platform_Desktop_24x"), TEXT("Launcher/Desktop/Platform_Desktop_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnWindows /* see note below */, TEXT(""), TEXT(""), false, true, false, TEXT("AllDesktop"), TEXT("Desktop")),
BuildPlatformInfo(TEXT("TVOS"), TEXT("TVOS"), LOCTEXT("TVOSTargetPlatDisplay", "tvOS"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/TVOS/Platform_TVOS_24x"), TEXT("Launcher/TVOS/Platform_TVOS_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnWindows || IsAvailableOnMac, TEXT("TVOS"), TEXT("TVOS"), false, true, false, TEXT("TVOS"), TEXT("Mobile")),
BuildPlatformInfo(TEXT("Switch"), TEXT("Switch"), LOCTEXT("Switch", "Switch"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/Switch/Platform_Switch_24x"), TEXT("Launcher/Switch/Platform_Switch_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnWindows, TEXT("Switch"), TEXT("Switch"), false, true, true, TEXT("Switch"), TEXT("Mobile")),
BuildPlatformInfo(TEXT("Switch"), TEXT("Switch"), LOCTEXT("Switch", "Switch"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/Switch/Platform_Switch_24x"), TEXT("Launcher/Switch/Platform_Switch_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnWindows, TEXT("Switch"), TEXT("Switch"), false, true, true, TEXT("Switch"), TEXT("Console")),
BuildPlatformInfo(TEXT("Lumin"), TEXT("Lumin"), LOCTEXT("Lumin", "Lumin"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/LuminTarget/Platform_Lumin_24x"), TEXT("Launcher/Lumin/Platform_Lumin_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnLinux || IsAvailableOnWindows || IsAvailableOnMac, TEXT("Lumin"), TEXT("Lumin"), false, true, false, TEXT("Lumin"), TEXT("Mobile")),
BuildPlatformInfo(TEXT("Quail"), TEXT("Quail"), LOCTEXT("Quail", "Quail"), EPlatformType::Game, EPlatformFlags::None, FPlatformIconPaths(TEXT("Launcher/Quail/Platform_Quail_24x"), TEXT("Launcher/Quail/Platform_Quail_128x")), TEXT(""), TEXT(""), EPlatformSDKStatus::Unknown, TEXT(""), IsAvailableOnWindows, TEXT("Quail"), TEXT("Quail"), false, true, true, TEXT("Quail"), TEXT("")),
@@ -328,24 +328,21 @@ const TArray<FName>& GetAllPlatformGroupNames()
} // namespace PlatformInfo
namespace Lex
FString LexToString(const PlatformInfo::EPlatformType Value)
{
FString ToString(const PlatformInfo::EPlatformType Value)
switch (Value)
{
switch (Value)
{
case PlatformInfo::EPlatformType::Game:
return TEXT("Game");
case PlatformInfo::EPlatformType::Editor:
return TEXT("Editor");
case PlatformInfo::EPlatformType::Client:
return TEXT("Client");
case PlatformInfo::EPlatformType::Server:
return TEXT("Server");
}
return TEXT("");
case PlatformInfo::EPlatformType::Game:
return TEXT("Game");
case PlatformInfo::EPlatformType::Editor:
return TEXT("Editor");
case PlatformInfo::EPlatformType::Client:
return TEXT("Client");
case PlatformInfo::EPlatformType::Server:
return TEXT("Server");
}
return TEXT("");
}
#undef LOCTEXT_NAMESPACE