[Upgrade Notes Critical! Licensee build scripts and DeviceProfiles may need updating]

- Formalizing all TargetPlatforms to have a Client version, rename WindowsNoEditor to Windows, and removing DDPI specification of TargetPlatforms, and generate them programmatically - Updated names DeviceProfiles and Build scripts, as above - Some PlatformInfo class cleanup - Added a TNonDesktopTargetPlatformBase class to make most TargetPlatforms simpler - Added "No Compiled Support" to the Turnkey LaunchOn menu when the TargetPlatforms aren't compiled in (to show that even if you install an SDK, you will need to compile before you can LaunchOn)\ - Starting the transition away from PlatformInfo::FPlatformInfo to FDDPI [CL 13966487 by Josh Adams in ue5-main branch]
2026-03-26 18:15:20 -07:00 · 2020-07-29 16:19:10 -04:00
parent 88c2ccf6bc
commit 5f27a8dbcb
78 changed files with 544 additions and 1102 deletions
--- a/Engine/Build/Commit.gitdeps.xml
+++ b/Engine/Build/Commit.gitdeps.xml
@@ -9033,10 +9033,6 @@
    <File Name="Engine/Content/Editor/Slate/Launcher/Mac/Platform_Mac_24x.png" Hash="afc5852358135ba2482815022c7959d107d043c2" />
    <File Name="Engine/Content/Editor/Slate/Launcher/TVOS/Platform_TVOS_128x.png" Hash="f710f0a44dcbc7f52d0aa9e87e5b85d56e39adff" />
    <File Name="Engine/Content/Editor/Slate/Launcher/TVOS/Platform_TVOS_24x.png" Hash="a935d2587dca193415edd2a5b296254d3f15d8d7" />
-    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_WindowsNoEditor_128x.png" Hash="ce5828482dffdc649bab68f7ee4d8af1f5c354d2" />
-    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_WindowsNoEditor_24x.png" Hash="ecd9981306c482fea47be4d5741d5bd33cf31dfc" />
-    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_WindowsServer_128x.png" Hash="0ef01f9938ae3786f53dc0dce0b8e103f2c425ca" />
-    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_WindowsServer_24x.png" Hash="6f5cfa2e8f426b3209461cf338ee3efb138f7c55" />
    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_Windows_128x.png" Hash="dfc897947d12f305b5bf6a82ab1859164c25b522" />
    <File Name="Engine/Content/Editor/Slate/Launcher/Windows/Platform_Windows_24x.png" Hash="27efd8bca11bf322ccfd9bb86ef2d900d7ed954b" />
    <File Name="Engine/Content/Editor/Slate/NewLevels/NewLevelBlank.png" Hash="dd63731df3c4332d585afd89138e9980f8b5efa2" />
@@ -61609,7 +61605,6 @@
    <Blob Hash="0ee75f46523ddd612f62c7ee2c4289a098e139a6" Size="3433" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="869013" />
    <Blob Hash="0ee8c8c9108d19f953016b848409d12c9632cb78" Size="7411" PackHash="61e546cd23708ca1bfdc52fd57ce15a42d507074" PackOffset="8" />
    <Blob Hash="0eea8e203f72cc3ca2b2789ff761d2ea0655889b" Size="139900" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="273022" />
-    <Blob Hash="0ef01f9938ae3786f53dc0dce0b8e103f2c425ca" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1366410" />
    <Blob Hash="0ef0b555803363152115bbb33c214b54b74adb9b" Size="947" PackHash="a05e5449e479953c4c8e016760f4275a502057fd" PackOffset="2090731" />
    <Blob Hash="0ef238e57d4692f2d1bb15be1f395a02963d6256" Size="3364" PackHash="ef5f89b1f1bb23ce38b8270e0ea4d89f2634bf13" PackOffset="1375054" />
    <Blob Hash="0ef3b18dc856a5b053b348acad305e3a2d6ec69b" Size="56439" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="87986" />
@@ -76789,7 +76784,6 @@
    <Blob Hash="6f5950cc3f39034bb6f0ceda7e2a003c77426058" Size="279" PackHash="6974b9c6f99dd329465ca79c60ac6eebd6d448a5" PackOffset="469830" />
    <Blob Hash="6f59b536ade47bd4b21765abe090574e2c9fcc11" Size="103424" PackHash="b5c98d19a7d93b4e3ce8460fa33943e7251658dc" PackOffset="1760539" />
    <Blob Hash="6f59d79631ce4b90a00226699afa3283669c7eef" Size="5329" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="608400" />
-    <Blob Hash="6f5cfa2e8f426b3209461cf338ee3efb138f7c55" Size="5117" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1434868" />
    <Blob Hash="6f5d428400e50438591ab5f2b38c3701b1fd470f" Size="3395504" PackHash="0b3f886e224e5779fb808961746a32d6a6874f5b" PackOffset="8" />
    <Blob Hash="6f5ea6773cd790ba62cef1ccb0126b9c32ea85d3" Size="4536" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2050953" />
    <Blob Hash="6f5ec2c37e08dfbcb79233799377076b9728ea6a" Size="333" PackHash="6974b9c6f99dd329465ca79c60ac6eebd6d448a5" PackOffset="446878" />
@@ -91856,7 +91850,6 @@
    <Blob Hash="ce55d4fc672687ef3fbcab2ca8da10e529da816f" Size="3287" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1513195" />
    <Blob Hash="ce5678395925720c5329e47beed0b6119e4addea" Size="109580" PackHash="7b46d8e4d5b49db0c9c36dfc37bfdc491ea056f6" PackOffset="961204" />
    <Blob Hash="ce58130464a8f6c98291970ca6ad3c6903d92de0" Size="3200" PackHash="543b7cdbb57452bf39397e5e16b5479276f81976" PackOffset="1541050" />
-    <Blob Hash="ce5828482dffdc649bab68f7ee4d8af1f5c354d2" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1292835" />
    <Blob Hash="ce585c2243704a47df23131fd3ebc4c1f40aeeb1" Size="1547" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1989812" />
    <Blob Hash="ce5c4d31df1e0c0e747972ad16be223a2d917d76" Size="37639" PackHash="3ccff075696c0aed356c1bbbb0104bb2cb65f696" PackOffset="355335" />
    <Blob Hash="ce5d53a8d038eff665f66ee46de6822796146a32" Size="5684" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1896508" />
@@ -96749,7 +96742,6 @@
    <Blob Hash="ecd0760e2f05d3a7b421a50832981313a1a953fd" Size="3400" PackHash="5fe083d2657bcc437d90980ebe66822f37483b60" PackOffset="653762" />
    <Blob Hash="ecd4ccc442b0a70efc3c73bc13c05b122f073738" Size="507" PackHash="82cb21b227e582936389d89d9046bc819223c778" PackOffset="1680986" />
    <Blob Hash="ecd887370a4453e67a642a46bef4bb4593c0cedd" Size="80" PackHash="375fc7daadf4e7c57ed3fb499492997b710a6201" PackOffset="1621284" />
-    <Blob Hash="ecd9981306c482fea47be4d5741d5bd33cf31dfc" Size="5117" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1361293" />
    <Blob Hash="ecda268c562e5e0253c28335057a4a70d7b99977" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="921148" />
    <Blob Hash="ecdcdcc548638bab745702991899ffdc64338a05" Size="100" PackHash="a44dc4b35972b9dad88e2ad3e0a47c8db7399c27" PackOffset="2086572" />
    <Blob Hash="ecdda0ab7e521aca4a33318d8f7411a6ae4f83da" Size="1104" PackHash="dfff3426b764465afe3294d949579adb2650f7ce" PackOffset="8" />
--- a/Engine/Build/InstalledEngineBuild.xml
+++ b/Engine/Build/InstalledEngineBuild.xml
@@ -547,14 +547,14 @@
 		</Node>
 	</Agent>

-	<Property Name="DDCPlatformsWin64" Value="Windows"/>
-	<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+WindowsNoEditor" If="'$(WithWin64)' == true"/>
+	<Property Name="DDCPlatformsWin64" Value="WindowsEditor"/>
+	<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+Windows" If="'$(WithWin64)' == true"/>
 	<Do If="'$(HostPlatformDDCOnly)' == false">
 		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+Android_ATC" If="'$(WithAndroid)' == true"/>
 		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+IOS" If="'$(WithIOS)' == true"/>
 		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+TVOS" If="'$(WithTVOS)' == true"/>
-		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+LinuxNoEditor" If="'$(WithLinux)' == true"/>
-		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+LinuxAArch64NoEditor" If="'$(WithLinuxAArch64)' == true"/>
+		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+Linux" If="'$(WithLinux)' == true"/>
+		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+LinuxAArch64" If="'$(WithLinuxAArch64)' == true"/>
 		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+Lumin" If="'$(WithLumin)' == true"/>
 		<Property Name="DDCPlatformsWin64" Value="$(DDCPlatformsWin64)+HoloLens" If="'$(WithHoloLens)' == true"/>
 		<ForEach Name="Platform" Values="$(ExtensionPlatforms)">
@@ -629,8 +629,8 @@
 		</Node>
 	</Agent>

-	<Property Name="DDCPlatformsMac" Value="Mac"/>
-	<Property Name="DDCPlatformsMac" Value="$(DDCPlatformsMac)+MacNoEditor" If="'$(WithMac)' == true"/>
+	<Property Name="DDCPlatformsMac" Value="MacEditor"/>
+	<Property Name="DDCPlatformsMac" Value="$(DDCPlatformsMac)+Mac" If="'$(WithMac)' == true"/>
 	<Do If="'$(HostPlatformDDCOnly)' == false">
 		<Property Name="DDCPlatformsMac" Value="$(DDCPlatformsMac)+Android_ATC" If="'$(WithAndroid)' == true"/>
 		<Property Name="DDCPlatformsMac" Value="$(DDCPlatformsMac)+IOS" If="'$(WithIOS)' == true"/>
@@ -666,10 +666,10 @@
 		</Node>
 	</Agent>

-	<Property Name="DDCPlatformsLinux" Value="Linux"/>
-	<Property Name="DDCPlatformsLinux" Value="$(DDCPlatformsLinux)+LinuxNoEditor" If="'$(WithLinux)' == true"/>
+	<Property Name="DDCPlatformsLinux" Value="LinuxEditor"/>
+	<Property Name="DDCPlatformsLinux" Value="$(DDCPlatformsLinux)+Linux" If="'$(WithLinux)' == true"/>
 	<Do If="'$(HostPlatformDDCOnly)' == false">
-		<Property Name="DDCPlatformsLinux" Value="$(DDCPlatformsLinux)+LinuxAArch64NoEditor" If="'$(WithLinuxAArch64)' == true"/>
+		<Property Name="DDCPlatformsLinux" Value="$(DDCPlatformsLinux)+LinuxAArch64" If="'$(WithLinuxAArch64)' == true"/>
 	</Do>

 	<Agent Name="DDC Group Linux" Type="Linux;Win64">
--- a/Engine/Config/Android/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/Android/DataDrivenPlatformInfo.ini
@@ -14,73 +14,3 @@ bUsesHostCompiler=false
 bUATClosesAfterLaunch=true
 PlatformGroupName=Mobile

-[PlatformInfo Android]
-TargetPlatformName=Android
-DisplayName=Android
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo Android_Multi]
-TargetPlatformName=Android_Multi
-DisplayName=Android (Multi)
-PlatformType=Game
-PlatformFlags=CookFlavor
-UATCommandLine=-targetplatform=Android -cookflavor=Multi
-
-[PlatformInfo Android_DXT]
-TargetPlatformName=Android_DXT
-DisplayName=Android (DXT)
-PlatformType=Game
-PlatformFlags=CookFlavor
-UATCommandLine=-targetplatform=Android -cookflavor=DXT
-
-[PlatformInfo Android_ETC2]
-TargetPlatformName=Android_ETC2
-DisplayName=Android (ETC2)
-PlatformType=Game
-PlatformFlags=CookFlavor
-UATCommandLine=-targetplatform=Android -cookflavor=ETC2
-
-[PlatformInfo Android_ASTC]
-TargetPlatformName=Android_ASTC
-DisplayName=Android (ASTC)
-PlatformType=Game
-PlatformFlags=CookFlavor
-UATCommandLine=-targetplatform=Android -cookflavor=ASTC
-
-
-[PlatformInfo AndroidClient]
-TargetPlatformName=AndroidClient
-DisplayName=Android (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
-
-[PlatformInfo Android_MultiClient]
-TargetPlatformName=Android_MultiClient
-DisplayName=Android (Multi) (Client-only)
-PlatformType=Client
-PlatformFlags=CookFlavor
-UATCommandLine=-client -targetplatform=Android -cookflavor=Multi
-
-[PlatformInfo Android_DXTClient]
-TargetPlatformName=Android_DXTClient
-DisplayName=Android (DXT) (Client-only)
-PlatformType=Client
-PlatformFlags=CookFlavor
-UATCommandLine=-client -targetplatform=Android -cookflavor=DXT
-
-[PlatformInfo Android_ETC2Client]
-TargetPlatformName=Android_ETC2Client
-DisplayName=Android (ETC2) (Client-only)
-PlatformType=Client
-PlatformFlags=CookFlavor
-UATCommandLine=-client -targetplatform=Android -cookflavor=ETC2
-
-[PlatformInfo Android_ASTCClient]
-TargetPlatformName=Android_ASTCClient
-DisplayName=Android (ASTC) (Client-only)
-PlatformType=Client
-PlatformFlags=CookFlavor
-UATCommandLine=-client -targetplatform=Android -cookflavor=ASTC
--- a/Engine/Config/BaseDeviceProfiles.ini
+++ b/Engine/Config/BaseDeviceProfiles.ini
@@ -4,8 +4,8 @@
 *TextureLODGroups=Group

 [DeviceProfiles]
+DeviceProfileNameAndTypes=WindowsEditor,Windows
 +DeviceProfileNameAndTypes=Windows,Windows
-+DeviceProfileNameAndTypes=WindowsNoEditor,Windows
 +DeviceProfileNameAndTypes=WindowsServer,Windows
 +DeviceProfileNameAndTypes=WindowsClient,Windows
 +DeviceProfileNameAndTypes=IOS,IOS
@@ -52,13 +52,13 @@
 +DeviceProfileNameAndTypes=AppleTV,IOS
 +DeviceProfileNameAndTypes=AppleTV4K,IOS
 +DeviceProfileNameAndTypes=TVOS,AppleTV
-+DeviceProfileNameAndTypes=Mac,Mac
+DeviceProfileNameAndTypes=MacEditor,Mac
 +DeviceProfileNameAndTypes=MacClient,Mac
-+DeviceProfileNameAndTypes=MacNoEditor,Mac
+DeviceProfileNameAndTypes=Mac,Mac
 +DeviceProfileNameAndTypes=MacServer,Mac
+DeviceProfileNameAndTypes=LinuxEditor,Linux
 +DeviceProfileNameAndTypes=Linux,Linux
-+DeviceProfileNameAndTypes=LinuxNoEditor,Linux
-+DeviceProfileNameAndTypes=LinuxAArch64NoEditor,Linux
+DeviceProfileNameAndTypes=LinuxAArch64,Linux
 +DeviceProfileNameAndTypes=LinuxClient,Linux
 +DeviceProfileNameAndTypes=LinuxAArch64Client,Linux
 +DeviceProfileNameAndTypes=LinuxServer,Linux
@@ -128,11 +128,11 @@ TextureLODGroups=(Group=TEXTUREGROUP_World,MinLODSize=1,MaxLODSize=8192,LODBias=
 [Windows DeviceProfile]
 DeviceType=Windows
 BaseProfileName=
-; +CVars=r.Vulkan.EnableValidation=0

-[WindowsNoEditor DeviceProfile]
+[WindowsEditor DeviceProfile]
 DeviceType=Windows
 BaseProfileName=Windows
+; +CVars=r.Vulkan.EnableValidation=0

 [WindowsClient DeviceProfile]
 DeviceType=Windows
@@ -698,7 +698,7 @@ BaseProfileName=
 DeviceType=Mac
 BaseProfileName=Mac

-[MacNoEditor DeviceProfile]
+[MacEditor DeviceProfile]
 DeviceType=Mac
 BaseProfileName=Mac

@@ -712,29 +712,25 @@ BaseProfileName=
 MeshLODSettings=
 TextureLODSettings=

-[LinuxNoEditor DeviceProfile]
+[LinuxEditor DeviceProfile]
 DeviceType=Linux
 BaseProfileName=Linux
 MeshLODSettings=
 TextureLODSettings=
-+CVars=r.RHICmdBypass=0

-[LinuxAArch64NoEditor DeviceProfile]
+[LinuxAArch6 DeviceProfile]
 DeviceType=Linux
 BaseProfileName=Linux
 MeshLODSettings=
 TextureLODSettings=
-+CVars=r.RHICmdBypass=0

 [LinuxClient DeviceProfile]
 DeviceType=Linux
 BaseProfileName=Linux
-+CVars=r.RHICmdBypass=0

 [LinuxAArch64Client DeviceProfile]
 DeviceType=Linux
 BaseProfileName=Linux
-+CVars=r.RHICmdBypass=0

 [LinuxServer DeviceProfile]
 DeviceType=Linux
@@ -750,4 +746,4 @@ TextureLODSettings=

 [HoloLens DeviceProfile]
 DeviceType=HoloLens
-BaseProfileName=WindowsNoEditor
+BaseProfileName=Windows
--- a/Engine/Config/HoloLens/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/HoloLens/DataDrivenPlatformInfo.ini
@@ -3,8 +3,8 @@ bIsConfidential=false
 Freezing_MaxFieldAlignment=8
 Freezing_bAlignBases=true

-NormalIconPath=Launcher/Windows/Platform_WindowsNoEditor_24x
-LargeIconPath=Launcher/Windows/Platform_WindowsNoEditor_128x
+NormalIconPath=Launcher/Windows/Platform_Windows_24x
+LargeIconPath=Launcher/Windows/Platform_Windows_128x
 XLargeIconPath=
 AutoSDKPath=
 TutorialPath=/Engine/Tutorial/Installation/InstallingVisualStudioTutorial.InstallingVisualStudioTutorial
@@ -16,9 +16,3 @@ bCanUseCrashReporter=false
 bUATClosesAfterLaunch=false
 PlatformGroupName=Mobile

-[PlatformInfo HoloLens]
-TargetPlatformName=HoloLens
-DisplayName=HoloLens
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=-targetplatform=HoloLens
--- a/Engine/Config/IOS/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/IOS/DataDrivenPlatformInfo.ini
@@ -15,17 +15,3 @@ Linux:bIsEnabled=false
 bUsesHostCompiler=false
 bUATClosesAfterLaunch=true
 PlatformGroupName=Mobile
-
-[PlatformInfo IOS]
-TargetPlatformName=IOS
-DisplayName=iOS
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo IOSClient]
-TargetPlatformName=IOSClient
-DisplayName=iOS (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
--- a/Engine/Config/Linux/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/Linux/DataDrivenPlatformInfo.ini
@@ -15,30 +15,3 @@ bUATClosesAfterLaunch=true
 PlatformGroupName=Desktop
 PlatformSubMenu=Linux

-[PlatformInfo Linux]
-TargetPlatformName=Linux
-DisplayName=Linux (Editor)
-PlatformType=Editor
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo LinuxNoEditor]
-TargetPlatformName=LinuxNoEditor
-DisplayName=Linux
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=-targetplatform=Linux
-
-[PlatformInfo LinuxClient]
-TargetPlatformName=LinuxClient
-DisplayName=Linux (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
-
-[PlatformInfo LinuxServer]
-TargetPlatformName=LinuxServer
-DisplayName=Linux (Dedicated Server)
-PlatformType=Server
-PlatformFlags=None
-UATCommandLine=
--- a/Engine/Config/LinuxAArch64/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/LinuxAArch64/DataDrivenPlatformInfo.ini
@@ -16,23 +16,3 @@ bUATClosesAfterLaunch=true
 PlatformGroupName=Mobile
 PlatformSubMenu=Linux

-[PlatformInfo LinuxAArch64]
-TargetPlatformName=LinuxAArch64
-DisplayName=Linux (AArch64)
-PlatformType=Game
-PlatformFlags=BuildFlavor
-UATCommandLine=-targetplatform=LinuxAArch64
-
-[PlatformInfo LinuxAArch64Client]
-TargetPlatformName=LinuxAArch64Client
-DisplayName=LinuxAArch64 (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
-
-[PlatformInfo LinuxAArch64Server]
-TargetPlatformName=LinuxAArch64Server
-DisplayName=LinuxAArch64 (Dedicated Server)
-PlatformType=Server
-PlatformFlags=None
-UATCommandLine=
--- a/Engine/Config/Lumin/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/Lumin/DataDrivenPlatformInfo.ini
@@ -14,16 +14,3 @@ bUsesHostCompiler=false
 bUATClosesAfterLaunch=true
 PlatformGroupName=Mobile

-[PlatformInfo Lumin]
-TargetPlatformName=Lumin
-DisplayName=Lumin
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo LuminClient]
-TargetPlatformName=LuminClient
-DisplayName=Lumin (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
--- a/Engine/Config/Mac/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/Mac/DataDrivenPlatformInfo.ini
@@ -14,30 +14,3 @@ bUsesHostCompiler=true
 bUATClosesAfterLaunch=true
 PlatformGroupName=Desktop

-[PlatformInfo MacNoEditor]
-TargetPlatformName=MacNoEditor
-DisplayName=Mac
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=-targetplatform=Mac
-
-[PlatformInfo Mac]
-TargetPlatformName=Mac
-DisplayName=Mac (Editor)
-PlatformType=Editor
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo MacClient]
-TargetPlatformName=MacClient
-DisplayName=Mac (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
-
-[PlatformInfo MacServer]
-TargetPlatformName=MacServer
-DisplayName=Mac (Dedicated Server)
-PlatformType=Server
-PlatformFlags=None
-UATCommandLine=
--- a/Engine/Config/TVOS/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/TVOS/DataDrivenPlatformInfo.ini
@@ -15,16 +15,3 @@ bUsesHostCompiler=false
 bUATClosesAfterLaunch=true
 PlatformGroupName=Mobile

-[PlatformInfo TVOS]
-TargetPlatformName=TVOS
-DisplayName=tvOS
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo TVOSClient]
-TargetPlatformName=TVOSClient
-DisplayName=tvOS (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
--- a/Engine/Config/Windows/DataDrivenPlatformInfo.ini
+++ b/Engine/Config/Windows/DataDrivenPlatformInfo.ini
@@ -7,8 +7,8 @@ Freezing_MaxFieldAlignment32=4
 Freezing_MaxFieldAlignment64=8
 Freezing_bAlignBases=true

-NormalIconPath=Launcher/Windows/Platform_WindowsNoEditor_24x
-LargeIconPath=Launcher/Windows/Platform_WindowsNoEditor_128x
+NormalIconPath=Launcher/Windows/Platform_Windows_24x
+LargeIconPath=Launcher/Windows/Platform_Windows_128x
 XLargeIconPath=
 AutoSDKPath=
 TutorialPath=/Engine/Tutorial/Installation/InstallingVisualStudioTutorial.InstallingVisualStudioTutorial
@@ -21,35 +21,6 @@ bUATClosesAfterLaunch=false
 PlatformGroupName=Desktop
 UBTPlatformName=Win64

-
-[PlatformInfo WindowsNoEditor]
-TargetPlatformName=WindowsNoEditor
-DisplayName=Windows
-PlatformType=Game
-PlatformFlags=None
-UATCommandLine=-targetplatform=Win64
-
-[PlatformInfo Windows]
-TargetPlatformName=Windows
-DisplayName=Windows (Editor)
-PlatformType=Editor
-PlatformFlags=None
-UATCommandLine=
-
-[PlatformInfo WindowsClient]
-TargetPlatformName=WindowsClient
-DisplayName=Windows (Client-only)
-PlatformType=Client
-PlatformFlags=None
-UATCommandLine=-client
-
-[PlatformInfo WindowsServer]
-TargetPlatformName=WindowsServer
-DisplayName=Windows (Dedicated Server)
-PlatformType=Server
-PlatformFlags=None
-UATCommandLine=
-
 [ShaderPlatform PCD3D_SM5]
 bSupportsRayTracing=true
 bSupportsRayTracingMissShaderBindings=true
--- a/Engine/Plugins/Editor/MobileLauncherProfileWizard/Source/MobileLauncherProfileWizard/Private/SProfileWizardUI.cpp
+++ b/Engine/Plugins/Editor/MobileLauncherProfileWizard/Source/MobileLauncherProfileWizard/Private/SProfileWizardUI.cpp
@@ -742,7 +742,7 @@ void SProfileWizardUI::CacheCookFlavorsList()
 	const PlatformInfo::FTargetPlatformInfo* Info = FindPlatformInfo(TargetPlatformName);
 	for (const FTargetPlatformInfo* PlatformFlaworInfo : Info->Flavors)
 	{
-		DLCFlavorList.Add(MakeShareable(new FString(PlatformFlaworInfo->PlatformInfoName.ToString())));
+		DLCFlavorList.Add(MakeShareable(new FString(PlatformFlaworInfo->Name.ToString())));
 	}

 	// In case no flavors, add vanilla name as cooking target
--- a/Engine/Plugins/Enterprise/DatasmithImporter/Source/DatasmithImporter/Private/Utility/DatasmithImporterImpl.cpp
+++ b/Engine/Plugins/Enterprise/DatasmithImporter/Source/DatasmithImporter/Private/Utility/DatasmithImporterImpl.cpp
@@ -931,7 +931,7 @@ bool FDatasmithImporterImpl::CheckAssetPersistenceValidity(const FString& Packag
 	}

 	const FString AbsoluteGamePath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
-	const FString AbsoluteGameCookPath = AbsoluteGamePath / TEXT("Saved") / TEXT("Cooked") / TEXT("WindowsNoEditor") / GameName;
+	const FString AbsoluteGameCookPath = AbsoluteGamePath / TEXT("Saved") / TEXT("Cooked") / TEXT("Windows") / GameName;

 	FString AssetPathWithinCookDir = AbsolutePathToAsset;
 	FPaths::RemoveDuplicateSlashes(AssetPathWithinCookDir);
--- a/Engine/Plugins/Media/MediaPlayerEditor/Source/MediaPlayerEditor/Private/Customizations/PlatformMediaSourceCustomization.cpp
+++ b/Engine/Plugins/Media/MediaPlayerEditor/Source/MediaPlayerEditor/Private/Customizations/PlatformMediaSourceCustomization.cpp
@@ -77,7 +77,7 @@ TSharedRef<SWidget> FPlatformMediaSourceCustomization::MakePlatformMediaSourcesV
 	{
 		if (PlatformInfo->PlatformType == EBuildTargetType::Game)
 		{
-			if (PlatformInfo->PlatformInfoName == TEXT("TVOS"))
+			if (PlatformInfo->Name == TEXT("TVOS"))
 			{
 				continue; // tvOS is just iOS for now
 			}
--- a/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatform.cpp
+++ b/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatform.cpp
@@ -16,10 +16,9 @@

 DEFINE_LOG_CATEGORY(LogHoloLensTargetPlatform);

-FHoloLensTargetPlatform::FHoloLensTargetPlatform()
+FHoloLensTargetPlatform::FHoloLensTargetPlatform(bool bIsClientOnly)
+	: TNonDesktopTargetPlatformBase(bIsClientOnly)
 {
-	PlatformInfo = ::PlatformInfo::FindPlatformInfo(FName("HoloLens"));
-
 #if WITH_ENGINE
 	FConfigCacheIni::LoadLocalIniFile(EngineSettings, TEXT("Engine"), true, *PlatformName());
 	TextureLODSettings = nullptr; // These are registered by the device profile system.
--- a/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatform.h
+++ b/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatform.h
@@ -27,14 +27,14 @@
 * FHoloLensTargetPlatform, abstraction for cooking HoloLens platforms
 */
 class HOLOLENSTARGETPLATFORM_API FHoloLensTargetPlatform
-	: public TTargetPlatformBase<FHoloLensPlatformProperties>
+	: public TNonDesktopTargetPlatformBase<FHoloLensPlatformProperties>
 {
 public:

 	/**
 	 * Default constructor.
 	 */
-	FHoloLensTargetPlatform();
+	FHoloLensTargetPlatform(bool bIsClient);

 	/**
 	 * Destructor.
@@ -59,8 +59,6 @@ public:

 	virtual bool GenerateStreamingInstallManifest(const TMultiMap<FString, int32>& ChunkMap, const TSet<int32>& ChunkIDsInUse) const override { return true; }

-	virtual bool IsRunningPlatform() const override { return false; }
-
 	virtual bool SupportsFeature(ETargetPlatformFeatures Feature) const override;

 	virtual bool SupportsBuildTarget(EBuildTargetType BuildTarget) const override;
@@ -114,21 +112,11 @@ public:
 		return true;
 	}

-	virtual FText GetVariantTitle() const override
-	{
-		return LOCTEXT("HoloLensVariantTitle", "Build Type");
-	}
-
 	virtual FString PlatformName() const override
 	{
 		return TEXT("HoloLens");
 	}

-	virtual FText GetVariantDisplayName() const override
-	{
-		return LOCTEXT("HoloLensVariantDisplayName", "HoloLens");
-	}
-
 	virtual float GetVariantPriority() const override
 	{
 		return 1.0f;
--- a/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatformModule.cpp
+++ b/Engine/Plugins/Runtime/AR/Microsoft/HoloLensAR/Source/HoloLensTargetPlatform/Private/HoloLensTargetPlatformModule.cpp
@@ -25,7 +25,8 @@ public:
 		if (FHoloLensTargetPlatform::IsUsable())
 		{
 			//@todo HoloLens: Check for SDK?
-			TargetPlatforms.Add(new FHoloLensTargetPlatform());
+			TargetPlatforms.Add(new FHoloLensTargetPlatform(false));
+			TargetPlatforms.Add(new FHoloLensTargetPlatform(true));
 		}
 	}
 };
--- a/Engine/Plugins/Runtime/WindowsDeviceProfileSelector/Source/WindowsDeviceProfileSelector/Private/WindowsDeviceProfileSelectorModule.cpp
+++ b/Engine/Plugins/Runtime/WindowsDeviceProfileSelector/Source/WindowsDeviceProfileSelector/Private/WindowsDeviceProfileSelectorModule.cpp
@@ -21,7 +21,7 @@ void FWindowsDeviceProfileSelectorModule::ShutdownModule()

 const FString FWindowsDeviceProfileSelectorModule::GetRuntimeDeviceProfileName()
 {
-	// Windows, WindowsNoEditor, WindowsClient, or WindowsServer
+	// Windows, WindowsEditor, WindowsClient, or WindowsServer
 	FString ProfileName = FPlatformProperties::PlatformName();

 	if (FApp::CanEverRender())
--- a/Engine/Source/Developer/Android/AndroidTargetPlatform/Private/AndroidTargetPlatform.cpp
+++ b/Engine/Source/Developer/Android/AndroidTargetPlatform/Private/AndroidTargetPlatform.cpp
@@ -190,8 +190,8 @@ static bool HasLicense()
 	return false;
 }

-FAndroidTargetPlatform::FAndroidTargetPlatform(bool bInIsClient )
-	: bIsClient(bInIsClient)
+FAndroidTargetPlatform::FAndroidTargetPlatform(bool bInIsClient, const TCHAR* FlavorName, const TCHAR* OverrideIniPlatformName)
+	: TNonDesktopTargetPlatformBase(bInIsClient, FlavorName, OverrideIniPlatformName)
 	, DeviceDetection(nullptr)

 {
@@ -310,11 +310,6 @@ ITargetDevicePtr FAndroidTargetPlatform::GetDevice( const FTargetDeviceId& Devic
 	return nullptr;
 }

-bool FAndroidTargetPlatform::IsRunningPlatform( ) const
-{
-	return false; // This platform never runs the target platform framework
-}
-

 bool FAndroidTargetPlatform::IsSdkInstalled(bool bProjectHasCode, FString& OutDocumentationPath) const
 {
@@ -658,10 +653,6 @@ bool FAndroidTargetPlatform::SupportsVariants() const
 	return true;
 }

-FText FAndroidTargetPlatform::GetVariantTitle() const
-{
-	return LOCTEXT("AndroidVariantTitle", "Texture Format");
-}

 /* FAndroidTargetPlatform implementation
 *****************************************************************************/
--- a/Show More
+++ b/Show More