Commit Graph

35 Commits

Author SHA1 Message Date
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
1fc22b4123 UBT: Update toolset version number for Visual Studio 2019 preview 2.
#rb none
#jira

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

[CL 4968431 by ben marsh in Main branch]
2019-02-12 09:39:39 -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
53467c22ef UBT: Deprecate Visual Studio 2015. Still technically supported from source if explicitly selected as the compiler for a particular target, but will not be automatically detected by UBT for building.
#rb none

[CL 4681677 by Ben Marsh in Dev-Build branch]
2019-01-04 11:35:38 -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
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
3936a5597e UBT: Initial support for Visual Studio 2019.
#rb none

[CL 4631203 by Ben Marsh in Dev-Build branch]
2018-12-05 01:04:21 -05:00
Ben Marsh
de9504c818 UBT: Allow project file generator to construct targets and query it directly. Removes a lot of global state, and simplifies code paths through building a target.
#rb none
#rnx

[CL 4603217 by Ben Marsh in Dev-Build branch]
2018-11-28 12:34:31 -05:00
Ben Marsh
4b2b815b48 Fix CIS.
#rb none
#rnx

[CL 4578082 by Ben Marsh in Dev-Build branch]
2018-11-19 10:40:36 -05:00
Ben Marsh
b0da1f4fe7 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]
2018-11-19 10:12:17 -05:00
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
Ben Marsh
9aa4b31fbc Merge fixes to project file generator from 4.21 branch (duplicate projects appearing in Xcode workspace, incorrect version association for solution on Windows)
#rb none
#lockdown Nick.Penwarden

[CL 4551290 by Ben Marsh in Main branch]
2018-11-08 10:18:07 -05:00
Ratherbflyin
37caa38a40 PR #5237: Fix missing VS version indicator on .sln icon (Contributed by Ratherbflyin)
#jira UE-66104
#rb none

[CL 4551198 by Ben Marsh in Dev-Build branch]
2018-11-08 09:54:42 -05:00
Ben Marsh
0f022f2f46 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4502641 by Ben Marsh in Dev-Build branch]
2018-10-24 13:03:31 -04:00
cmp-
2109e86ea9 PR #5180: Fix wrong .natvis file path in generated Visual Studio solution (Contributed by cmp-)
#jira UE-65432
#rb none

#ROBOMERGE-SOURCE: CL 4495051 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4495053 by ben marsh in Staging-4.21 branch]
2018-10-22 10:26:40 -04:00
ben marsh
2ea8e2cd21 Fix Visual Studio prompting to save solution file freshly generated by UBT. Solution configurations for stub projects were not being included.
Also fix natvis file being generated with the incorrect path for foreign projects.

#rb none
#jira UE-65392

#ROBOMERGE-SOURCE: CL 4481063 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4481065 by ben marsh in Staging-4.21 branch]
2018-10-17 14:29:24 -04:00
ben marsh
5b2c536b8a Fix "Invalid" configurations only being generated for Win32, causing VS2015 to complain about incomplete configurations on load. Now generates an "Invalid" configuration for every other platform supported by the project.
#rb none
#jira UE-64996

#ROBOMERGE-SOURCE: CL 4456797 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4456806 by ben marsh in Staging-4.21 branch]
2018-10-11 18:54:37 -04:00
Ben Marsh
014add9a9f Redo changes that were (deliberately) clobbered in Dev-Main merge.
#rb none

[CL 4450647 by Ben Marsh in Dev-Build branch]
2018-10-11 09:19:19 -04:00
Ben Marsh
983f6e4d86 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4450587 by Ben Marsh in Dev-Build branch]
2018-10-11 09:04:26 -04:00
ben marsh
80bced1121 Fix issues with mismatched solution/project configurations.
* Every C++ project now has an "invalid" configuration. Trying to build any solution configuration which does not apply to the project will now build that, which prints an error rather than building a completely different configuration.
* Available configurations are now parsed from C# files, so the "Release" configuration will now be used if "Development" is not available, and platforms are supported correctly.
* Programs are now built in game and editor configurations.

#rb none
#jira UE-59288

#ROBOMERGE-SOURCE: CL 4432766 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4432767 by ben marsh in Staging-4.21 branch]
2018-10-05 14:20:40 -04:00
ben marsh
d35a845858 Output Visual Studio project files in the same format as Visual Studio, and use StringBuilders everywhere to avoid large numbers of string copies.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4431637 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4431638 by ben marsh in Staging-4.21 branch]
2018-10-05 10:26:06 -04:00
ben marsh
f36fe54542 Remove natvis file from UE4 project.
#rb none
[FYI] Steve.Robb
#jira

#ROBOMERGE-SOURCE: CL 4426983 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426984 by ben marsh in Staging-4.21 branch]
2018-10-04 08:02:05 -04:00
ben marsh
0438a9ed86 Include the Visual Studio .natvis file as a solution item, to fix problems with VS2017 15.8.5 not finding it in a makefile project.
#rb none
#jira UE-64733

#ROBOMERGE-SOURCE: CL 4424584 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4424586 by ben marsh in Staging-4.21 branch]
2018-10-03 16:58:30 -04:00
Ben Marsh
d16ef6fe9d UBT: Remove the global registration of project file generators. This is now done only when needed (when actually generating project files).
#rb none
#rnx

[CL 4410042 by Ben Marsh in Dev-Build branch]
2018-10-01 09:45:58 -04:00