Commit Graph

238 Commits

Author SHA1 Message Date
Ben Marsh
53ec591dee Use strongly typed directory reference objects for additional directories.
#rb none
#rnx

[CL 10082990 by Ben Marsh in Dev-Build branch]
2019-11-08 10:37:21 -05:00
Joakim Lindqvist
49471e379d Fixed Rider projects failing to generate when a program was defined in the game projects folder, this is similar to how vs project generation works.
#jira UE-82911
#rb none

[CL 9966851 by Joakim Lindqvist in Dev-Build branch]
2019-11-04 08:41:55 -05:00
Joakim Lindqvist
3a8b293b1e Some command line arguments are now passed on to the target creation (visual studio version specifically). This fixes issues were overriding the visual studio version from command line would not be used in targets, resulting in errors when option like setting the compiler version were also used.
Reported in UDN:
https://udn.unrealengine.com/questions/528859/view.html

Also fixed so that HololensTarget is actually getting configured from setting sources, including command line and BuildConfiguration.xml which I added attributes for to match how Windows targets can be configured.

#rb ben.marsh

[CL 9866335 by Joakim Lindqvist in Dev-Build branch]
2019-10-28 04:53:02 -04:00
DecoyRS
f826d35393 PR #6297: Fixing Rider project files generator (Contributed by DecoyRS)
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 9839424 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v546-9757112)

[CL 9839431 by ben marsh in Main branch]
2019-10-25 11:09:19 -04:00
Ben Marsh
1b24b38d91 Add missing XML documentation to suppress warnings.
#rb none
#rnx
#jira

[CL 9564726 by Ben Marsh in 4.24 branch]
2019-10-13 20:57:42 -04:00
Mitchell Wilson
f0a83e9112 Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main)
#rb none
#rnx

[CL 9551884 by Mitchell Wilson in Main branch]
2019-10-11 16:59:16 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Ben Marsh
b6039a9873 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419420 by Ben Marsh in Dev-Build branch]
2019-10-04 11:20:44 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
Nick Shin
3526d16d5e merge/copyup to parent stream - HTML5 platform extension
#jira UEMOB-482  HTML5 platform as a plug in
#rb josh.adams
#rn

[CL 9306021 by Nick Shin in Dev-Build branch]
2019-09-30 15:13:56 -04:00
ben marsh
3d59f3f1fc UBT: Allow filtering the platforms we generate project files for, from the BuildConfiguration.xml file. Reduces memory usage in the IDE by a bit.
#jira


#ROBOMERGE-SOURCE: CL 9098105 via CL 9098106
#ROBOMERGE-BOT: (v443-9013191)

[CL 9100723 by ben marsh in Main branch]
2019-09-25 14:33:33 -04:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
2019-09-24 16:13:51 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Ben Marsh
aa45fb1bf3 UBT: Make the -Quiet option per-target, and use it to suppress toolchain and adaptive non-unity info for secondary build targets.
#rb none
#rnx

[CL 8638712 by Ben Marsh in Dev-Build branch]
2019-09-11 11:52:41 -04:00
Ben Marsh
421de9107a Fix editor-only plugins triggering recompilation of code projects.
Also rework logic for determining whether a project needs to be compiled, to more closely match equivalent code in UAT. ITargetPlatform::NeedsTempTarget() now allows querying whether a project needs a temporary target to be generated.

#rb none
#jira UE-79833

[CL 8623682 by Ben Marsh in Dev-Build branch]
2019-09-10 16:11:58 -04:00
michael trepka
c314fa3324 Detect console application targets when generating Xcode project and set proper application type for them to avoid code signing and to allow launching them directly from Xcode
#jira UE-78994
#rb Ben.Marsh
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 8553337 in //UE4/Release-4.23/... via CL 8553340
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v408-8574093)

[CL 8592114 by michael trepka in Dev-Build branch]
2019-09-10 04:04:54 -04:00
Joakim Lindqvist
9993ee5b8c Fixed issue were using -Platforms to generate solution with a subset of platforms would break the editor finding the solution, reported in UDN https://udn.unrealengine.com/questions/523843/platform-specific-solution-rename-breaks-visualstu.html
#rb none

[CL 8570906 by Joakim Lindqvist in Dev-Build branch]
2019-09-09 04:34:10 -04:00
michael trepka
6201a44210 Detect console application targets when generating Xcode project and set proper application type for them to avoid code signing and to allow launching them directly from Xcode
#jira UE-78994
#rb Ben.Marsh
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8553337 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8553340 by michael trepka in Main branch]
2019-09-06 13:38:32 -04:00
arciel rekman
64aaeca9d1 Add UnrealInsights to the default makefile target on Linux.
#rb Brandon.Schaefer
[FYI] Michael.Sartain, Anthony.Bills
#jira none
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 8374027 in //UE4/Release-4.23/... via CL 8497743
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v406-8472469)

[CL 8534162 by arciel rekman in Dev-Build branch]
2019-09-06 08:35:17 -04:00
arciel rekman
fb0cbfa2c0 Add UnrealInsights to the default makefile target on Linux.
#rb Brandon.Schaefer
[FYI] Michael.Sartain, Anthony.Bills
#jira none
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 8374027 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8497743 by arciel rekman in Main branch]
2019-09-04 15:29:36 -04:00
Ben Marsh
cff319c573 Fixup directory references in WorkspaceTool, and allow projects under Engine/Extras to be added to project files.
#rb none
#rnx

[CL 8417289 by Ben Marsh in Dev-Build branch]
2019-09-03 08:12:40 -04:00
ben marsh
d47c5a6a53 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.markiewicz
#ROBOMERGE-SOURCE: CL 8321295 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v403-8382528)

[CL 8393012 by ben marsh in Dev-Build branch]
2019-08-31 14:51:59 -04:00
Marcus Wassmer
da3a03e47c Copying //UE4/Dev-Mobile@8387500 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8387580 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-08-30 17:54:29 -04:00
jeff newquist
e639f21e50 Copy //UE4/Dev-Console to //UE4/Dev-RenderPlat-Staging
#rb none

[CL 8386275 by jeff newquist in Dev-RenderPlat-Staging branch]
2019-08-30 15:37:52 -04:00
Josh Markiewicz
d79515867d Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

[CL 8321295 by Josh Markiewicz in Main branch]
2019-08-26 18:35:22 -04:00