65 Commits

Author SHA1 Message Date
Ben Wright
03d13e0209 Revert "4.23 UWP - Hack to generate projects with VS2019 regardless of default VS2017 setting"
This reverts commit ccc16a214c.
2020-05-24 09:20:43 +12:00
Ben Wright
ccc16a214c 4.23 UWP - Hack to generate projects with VS2019 regardless of default VS2017 setting 2020-05-21 21:53:34 +12:00
Joakim Lindqvist
bcc5a055eb Changed order in which modules are mapped to visual studio projects
It is now Game -> Mod -> Program -> Engine -> Enterprise

This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.

#rb none
[review]-7795550 ben.marsh

(ushell-p4-cherrypick of 7839052 by Joakim.Lindqvist)


Fixed incorrect check for non enigne modules which broke in 7839052.
Also changed local function to a member to fix build issue.

#rb none

#jira UE-76985

[CL 7865223 by Joakim Lindqvist in 4.23 branch]
2019-08-08 05:06:29 -04:00
cmp-
2c64bf8ee4 PR #5942: UBT: Fix duplicate platform check (Contributed by cmp-)
#rb none
#rnx
#jira UE-76215

[CL 6988229 by Ben Marsh in 4.23 branch]
2019-06-14 08:16:58 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
David Harvey
a6aafea9d7 PlatformExtensions:
- extensions are included in the solution
 - extension automation projects are included under Automation, and built as part of AutomationTool

#rb josh.adams

[CL 6662967 by David Harvey in Main branch]
2019-05-29 06:35:09 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
ben marsh
02e4eddc0f UBT: Fix generated config files not being read by UBT, or being considered when determining if makefiles are out of date.
#rb none
#jira UE-71501

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

[CL 5392891 by ben marsh in Main branch]
2019-03-13 17:39:17 -04:00
ben marsh
aa231d7b6c UBT: Include other files in the project directory within the generated projects.
#rb none
#rnx
#jira

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

[CL 5271664 by ben marsh in Main branch]
2019-03-01 16:57:40 -05:00
ben marsh
fa17d1c79f UBT: Fix the user's selected Visual Studio version not being respected when generating project files.
#rb none
#jira UE-69239

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

[CL 4968336 by ben marsh in Main branch]
2019-02-12 09:35:52 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -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
Ben Marsh
6bef1a9def UBT: Remove code to add the -Monolithic option when generating intellisense data. This only exists to prevent intellisense errors because the DLLEXPORT and DLLIMPORT macros are mismatched for the project containing all modules; we can achieve this by explicitly modifying the macros instead.
#rb none
#rnx

[CL 4686059 by Ben Marsh in Dev-Build branch]
2019-01-07 15:09:52 -05:00
Ben Marsh
973932605e UBT: Fix project file generator including all projects in the workspace in the solution, even if a specific project file is specified.
#rb none
#rnx

[CL 4685376 by Ben Marsh in Dev-Build branch]
2019-01-07 12:21:18 -05:00
Ben Marsh
7ad281502a UBT: Don't assume the default architecture for a platform is the empty string. It's not on Linux, which causes warnings when generating project files.
#rb none
#jira UE-68019
#rnx

[CL 4682487 by Ben Marsh in Dev-Build branch]
2019-01-04 14:51:43 -05:00
Ben Marsh
ab043601f1 UBT: Remove the project dependency on ShaderCompileWorker being compiled for any project targets. Instead, SCW is built through the same UBT invocation that builds the editor, allowing files to be built in parallel. This also removes the dependency on ShaderCompileWorker being built for non-editor targets (since Visual Studio does not support per-configuration project dependencies).
#rb none

[CL 4681497 by Ben Marsh in Dev-Build branch]
2019-01-04 10:58:28 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Ben Marsh
bd434e9387 UBT: Convert the -SingleFile= argument to be per-target.
#rb none
#rnx

[CL 4671876 by Ben Marsh in Dev-Build branch]
2018-12-20 12:10:57 -05:00
Ben Marsh
61701a788c UBT: Optimize file operations to use cached file/directory info, and to discover plugins/rules files in parallel. Also add more stats for different parts of the build.
#rb none
#rnx

[CL 4671815 by Ben Marsh in Dev-Build branch]
2018-12-20 10:46:51 -05:00
Ben Marsh
5b31a8c5a5 PR #5356: Modified fix to accommodate default build environment being set to shared by the time Intellisense is being gathered.
#rb none
#rnx

[CL 4669424 by Ben Marsh in Dev-Build branch]
2018-12-18 19:46:33 -05:00
Ben Marsh
0270d8f66a UBT: Add a cache for source file metadata (containing text from the first include directive, and a flag for whether the file contains reflection markup). Replaces the previous include dependency cache, since we now only require the first include directive. Saves ~2s whenever UHTModuleInfo array has to be regenerated.
#rb none

[CL 4668325 by Ben Marsh in Dev-Build branch]
2018-12-18 10:21:34 -05:00
Ben Marsh
f01ddb51ae UBT: Add support for building multiple targets in parallel.
* A makefile is now constructed for each target, and the outdated actions are combined into a single graph before execution.
* Makefiles are used in all build modes, regardless of whether they are saved to disk, and represent the vector by which a target's build actions are passed to the executor.
* The -JsonExport= argument has been removed, and a separate JsonExport mode has been added (invoke with eg. "-Mode=JsonExport UE4Editor Win64 Development")
* Multiple action history files are kept open at one time, and a hierarchy is used for each target.

#rb none

[CL 4667512 by Ben Marsh in Dev-Build branch]
2018-12-17 20:49:30 -05:00
Ben Marsh
2073022699 UBT: Rename UBTMakefile to TargetMakefile.
#rb none
#rnx

[CL 4665132 by Ben Marsh in Dev-Build branch]
2018-12-16 21:20:19 -05:00
Ben Marsh
0c9707d678 UBT: Use compiler-generated dependency information for source file dependencies. This ensures that the dependency list is accurate, and makes incremental builds more reliable.
* A standalone Win32 application called cl-filter is used to parse output from running the Visual Studio compiler with the /showIncludes option, and generate a dependency list similar to Clang.
* Actions which produce an external dependency list declare it explicitly. If the dependency list is missing, or any of the contents are out of date, the action is rebuilt.
* The contents of dependency lists are cached by the CppDependencyCache class for future iterations.

#rb none

[CL 4665060 by Ben Marsh in Dev-Build branch]
2018-12-16 14:22:47 -05:00
ahaczewski
84ca76f90f PR #5356: UE-67548: UBT: Fix for IntelliSense generation for game projects using engine source (Contributed by ahaczewski)
#rb none
#rnx

[CL 4662991 by Ben Marsh in Dev-Build branch]
2018-12-14 15:42:55 -05:00