Commit Graph

4 Commits

Author SHA1 Message Date
ben marsh
d1eb7b7007 UBT: Always embed an application manifest during linking, rather than relying on the resource file to include one. This ensures that projects that have a custom resource file for icons, versioning metadata, etc... still operate correctly with manifested OS versions.
To embed a custom manifest, set the WindowsPlatform.ManifestFile to a vaild path in a *.Target.cs file. To disable the embedding of the default manifest, set it to null.

#rb none
#jira UE-88825, UE-87398

#ROBOMERGE-SOURCE: CL 11619014 in //UE4/Release-4.25/... via CL 11619045
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11619057 by ben marsh in Main branch]
2020-02-25 16:33:18 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
ben marsh
25b813086c Fix manifest on Win32 referencing amd64 version of common controls assembly causing executables to fail to start. Not sure why this is a regression; manifest from 4.21 (//UE4/Release-4.21/Engine/Source/Runtime/Launch/Resources/Windows/PCLaunch-Win32.manifest) also references the incorrect platform.
#rb none
#jira UE-69583

#ROBOMERGE-SOURCE: CL 4905059 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4905063 by ben marsh in Main branch]
2019-02-05 16:08:07 -05:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00