Thomas Sarkanen
474bc576ee
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5236305
...
#rb none
#jira none
[CL 5236785 by Thomas Sarkanen in Dev-Anim branch]
2019-02-28 04:41:36 -05:00
ben marsh
99b0880965
Add Visual Studio 2019 as a compiler for generating intellisense data.
...
#rb none
#rnx
#jira
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4993256 in //UE4/Release-4.22/... via CL 4993257
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)
[CL 5045253 by ben marsh in Dev-Anim branch]
2019-02-18 14:34:33 -05:00
ben marsh
099f0a7963
UBT: Update toolset version number for Visual Studio 2019 preview 2.
...
#rb none
#jira
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4954380 in //UE4/Release-4.22/... via CL 4968431
2019-02-16 04:05:48 -05:00
ben marsh
f378757f43
UBT: Fix the user's selected Visual Studio version not being respected when generating project files.
...
#rb none
#jira UE-69239
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4951803 in //UE4/Release-4.22/... via CL 4968336
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)
[CL 5027685 by ben marsh in Dev-Anim branch]
2019-02-16 04:05:26 -05:00
arciel rekman
6dae4a715e
Linux: harden the UBT makefile generator against .target.cs
...
#rb none
#jira none
[FYI] Brandon.Schaefer
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4950441 in //UE4/Release-4.22/... via CL 4950443
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)
[CL 5023857 by arciel rekman in Dev-Anim branch]
2019-02-16 02:59:47 -05:00
Lina Halper
f7baa58bc9
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
...
#fyi: Laurent.Delayen, James.Hopkin
#rb: none
[CL 4923303 by Lina Halper in Dev-Anim branch]
2019-02-06 14:35:56 -05:00
Marc Audy
e5610adfd8
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313
...
#rb
#rnx
#lockdown Laurent.Delayen
[CL 4803512 by Marc Audy in Dev-Anim branch]
2019-01-24 15:32:49 -05:00
Thomas Sarkanen
cc942a3341
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4768627
...
#rb none
#jira none
[CL 4769629 by Thomas Sarkanen in Dev-Anim branch]
2019-01-22 06:48:04 -05:00
Thomas Sarkanen
b709a10f4c
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
...
#rb none
#jira none
#lockdown Laurent.Delayen
[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00
Thomas Sarkanen
e0f6136524
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
...
#rb none
#jiira none
[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 04:11:30 -05:00
Thomas Sarkanen
8ba3c4c087
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
...
#rb none
#jira none
[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
Thomas Sarkanen
c51a339259
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4574801
...
#jira none
#rb none
[CL 4575789 by Thomas Sarkanen in Dev-Anim branch]
2018-11-19 07:03:18 -05:00
ben marsh
71279739f0
Allow multiple targets of the same type when generating project files. Secondary targets (as determined by sorting target files alphabetically) are placed in their own generated project file, with the ability to override the name of it specified by the GeneratedProjectName variable in the TargetRules class.
...
#rb none
#jira UE-65286
#ROBOMERGE-SOURCE: CL 4497282 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4497284 by ben marsh in Staging-4.21 branch]
2018-10-22 20:14:06 -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
789622a059
Proper fix for exception when generating project files, if the user does not have any valid platforms for building a target.
...
#rb none
#jira
#ROBOMERGE-SOURCE: CL 4460956 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4460958 by ben marsh in Staging-4.21 branch]
2018-10-12 13:43:39 -04:00
ben marsh
dacdb37e22
Fix "Invalid" folder being created when building invalid platform/configuration.
...
Also includes temporary fix for exception when generating project files.
#rb none
#jira UE-65159
#ROBOMERGE-SOURCE: CL 4460064 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4460066 by ben marsh in Staging-4.21 branch]
2018-10-12 11:36:00 -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
c1f6069c7f
Add a dummy output to the invalid configuration, to force it to always run.
...
#rb none
#jira UE-59288
#ROBOMERGE-SOURCE: CL 4454772 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4454787 by ben marsh in Staging-4.21 branch]
2018-10-11 16:40:27 -04:00
joe graf
0988dd614c
Disabled the clion ignore file generation on Windows since it isn't supported correctly there
...
#rb: none
#jira: UE-64871
#ROBOMERGE-SOURCE: CL 4442878 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4442884 by joe graf in Staging-4.21 branch]
2018-10-09 18:08:23 -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
2018-10-03 16:58:30 -04:00
joe graf
997a04c7e7
Merge Dev-VR->Release-4.21
...
#rb: merge
#jira: merge
#ROBOMERGE-SOURCE: CL 4406345
2018-09-28 13:19:15 -04:00
