Commit Graph

70 Commits

Author SHA1 Message Date
joe kirchoff
27ff6e1a17 BootstrapPackagedGame: Allow skipping the prereq installer if the required dependencies are bundled with the application
* Query the file version of dlls to be loaded so it can be compared against the min required version, in addition to ensuring the dll can be loaded
* Unload dlls after verifying they can be loaded
* Check bundled dlls first as dlls from an application's directory will be preferred when LoadLibrary is called.
* Check version of directx dlls
* Remove x86 logic, Win32 hasn't been supported for years
* Fix static analysis warnings

#jira UE-188536
#rb David.Harvey

[CL 27961367 by joe kirchoff in ue5-main branch]
2023-09-18 12:11:26 -04:00
joe kirchoff
d785b5b71b Update vcredist to 14.36.32532
#rnx
#jira UE-188536

[CL 26727875 by joe kirchoff in ue5-main branch]
2023-07-31 20:31:06 -04:00
joe kirchoff
7f087f6190 Fix missing project reference in CompileTimeAnalyzer
#rnx
#jira UE-187502

[CL 25806132 by joe kirchoff in ue5-main branch]
2023-06-05 18:43:38 -04:00
Joe Kirchoff
43d2fd20f4 CompileTimeAnalyzer: Fix compiling by adding missing project references to solution
#rnx
#jira UE-169090
#rb trivial
#preflight skipped

[CL 25570107 by Joe Kirchoff in ue5-main branch]
2023-05-22 16:47:01 -04:00
ionut matasaru
3d7c0e8440 UBT: Removed deprecated TargetInfo::bUseMallocProfiler toggle in Source/Programs.
#jira UE-141779
#rb Joe.Kirchoff
#rb Johan.Berg
#preflight 64380aea7a00790bfd116430

[CL 25101875 by ionut matasaru in ue5-main branch]
2023-04-19 04:15:59 -04:00
joe kirchoff
2272b8a633 Update prereq installer to install vcredist 14.34.31938
#rnx
#rb Tim.Smith
#jira UE-178434
#preflight 63f9031aae54ee4ce901fe62
#lockdown Francis.Hurteau

[CL 24412709 by joe kirchoff in ue5-main branch]
2023-02-24 19:00:18 -05:00
David Harvey
4bb6139ad2 BootstrapPackagedGame project is not build as non-unity.
- no known reason why this project needed to be non-unity in the first place.
 - this means it won't get the 'NonUnity' suffix (from CL23421728) & Windows packaging code works again.

#jira UE-173369
#rnx
#rb Joe.Kirchoff
#preflight 63c194a20225f00e142f6bdc

[CL 23680617 by David Harvey in ue5-main branch]
2023-01-13 12:43:59 -05:00
Josh Adams
1e0b0a3eff - Added GetProjectArchitectures, which UBT will use to determine the architecture to build with when -architecture is not specified (UEBuildMac is now using it to control architectures for programs/projects)
- Changed the very high level loop over targets and architectures to move the Architecture as innermost loop - this allows each target to compile with different architectures in the case of mutli-target compiling
- Added [Editor]DefaultArchitecture to Mac ini's - the [Editor]TargetArchitecture property is now what the target _supports_, and Default is what it will be built with if no architecture is specified (usually will be "Host" to indicate that whatever the current host platform is will be what is compiled. "All" can be used to compile Fat binaries by default.
- Updated the LinkEnvironment constructor that takes another LinkEnvironment and an Architecture, to filter the input files for that architecture, and removed the similar code from MacToolchain
- Updates for Programs for Mac compilation, either:
  -  Adding an .ini and a .uproject files - programs need a .uproject for UBT to be able to find their Config directory in a standard way)
  - Marking the Target as not supporting Mac (some programs call Windows code directly)
  - Updating libs to be fat (intel+arm)
#rb david.harvey
#preflight 638e47395624e6da5e9658d6

[CL 23397419 by Josh Adams in ue5-main branch]
2022-12-05 14:57:26 -05:00
joe kirchoff
95c918e91c UnrealBuildTool: Set VS2022 as the default generated solution and compiler if all available platforms are supported
#rb Francis.Hurteau
#rb Josh.Adams
#preflight 63768595de1d9b5c3c33cf9c

[CL 23184507 by joe kirchoff in ue5-main branch]
2022-11-17 16:58:58 -05:00
henrik karlsson
af8b7f9e69 [CompileTimeAnalyzer]
* Fixed so development config is using release version of CompileTimeAnalyzer project

#preflight skipped

[CL 21500777 by henrik karlsson in ue5-main branch]
2022-08-22 21:52:02 -04:00
henrik karlsson
daab2562bf [CompileTimeAnalyzer]
* Upgraded to .net 6 to make it work (since its dependencies are upgraded)
* Fixed a few compile errors
* Changed so CompileTimeAnalyzer looks for ".cta" files instead of ".timing.bin" files since that is what UBT is outputting these days
* Added bunch of pragma warning disable just to get through compiling

#preflight skipped

[CL 21500776 by henrik karlsson in ue5-main branch]
2022-08-22 21:51:50 -04:00
Joe Kirchoff
c6e761d3aa New Prereq installer for VS 2015-2022 redist
#jira UE-146064
#rnx
#rb none
#preflight 6272fc94365de864c4d01e1e

[CL 20523475 by Joe Kirchoff in ue5-main branch]
2022-06-06 13:28:55 -04:00
Ryan Hummer
201d28c677 Fixing pdb format for UnrealWindowsForms
With the dotnet6 upgrade the pdb settings needed to be updated to produce a valid PDB for Microsofts pdbcopy

#rnx
#jira none
#rb none
#preflight skip

[CL 20138769 by Ryan Hummer in ue5-main branch]
2022-05-11 09:54:01 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
josh adams
2f389629d4 - Fixed UnrealWindowForms.pdb to not be portable, which pdbcopy.exe can't handle
#rb trivial
#preflight none
#jira none
#p4v-cherrypick 18409432

[CL 18409472 by josh adams in ue5-main branch]
2021-12-08 14:22:36 -05:00
josh adams
c635d85289 - Fixing copyrights
#rb trivial
#preflight skip

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18242813 via CL 18244989 via CL 18245074 via CL 18245129 via CL 18246346 via CL 18246387
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18246402 by josh adams in ue5-release-engine-test branch]
2021-11-18 18:24:05 -05:00
josh adams
1386a55120 - Enabling UAT built on Windows to run on Linux, by pulling WinForms stuff out into a premade assembly (UnrealWindowsForms.dll)
- Note that for Windows to work, the AutomationTool.exe needs to be marked as a Desktop app, so when running on Linux, this command is needed one time: sed -i 's/WindowsDesktop/NETCore/' AutomationTool.runtimeconfig.json
- Removed some platform-specific checks for the platform building it, and #if WINDOWS type checks (not all gone, but getting better)
#rb jonathan.adamczewski
#preflight 6195a7de841fa7e69d5964d4
[FYI] graeme.thornton

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18237766 via CL 18242422 via CL 18242492 via CL 18242564 via CL 18244551 via CL 18244617
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18244669 by josh adams in ue5-release-engine-test branch]
2021-11-18 16:57:11 -05:00
jonathan adamczewski
6d74528a4b Update for changed MetaData.cs location
#jira none
#rb none
#trivial

#ROBOMERGE-SOURCE: CL 17152323 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17152326 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-12 10:57:45 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
ben marsh
fe37a5c2a0 Rename UE4PrereqSetup to UEPrereqSetup.
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 15441919 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15454168 by ben marsh in ue5-main branch]
2021-02-18 13:09:22 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00