Commit Graph

151 Commits

Author SHA1 Message Date
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
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
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
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
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
DecoyRS
9333dbbcfa PR #6063: Rider Project Model generation v 1.0 (Contributed by DecoyRS)
#rb none

[CL 8095590 by Ben Marsh in Dev-Build branch]
2019-08-16 13:41:27 -04:00
Joakim Lindqvist
cde9463cea Removed usage of platform extensions directory which does not exist anymore, resolves issue introduced in change 8034150
#rb none

[CL 8042438 by Joakim Lindqvist in Dev-Build branch]
2019-08-14 16:30:36 -04:00
Joakim Lindqvist
e5ae217978 Reworked module assignment to visual project files to simplify the rule, now the first matching target starting at the module file and searching upwards in the directory structure will be used as base for which project to use. If multiple targets are on the same level the old rules of Game -> Mod -> Program - > Engine -> Platform -> Enterprise applies.
#rb ben.marsh
#jira UE-78893

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

[CL 8034150 by Joakim Lindqvist in Dev-Build branch]
2019-08-14 11:55:58 -04:00
Joakim Lindqvist
c5c259570b Excluding target.cs files from the module source, fixes issue were target source gets assigned to a project multiple times (which in some cases results in it being assigned to a otherwise empty project)
Resolves issue with games having a program with the same overlapping name.

#rb ben.marsh

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

[CL 8034100 by Joakim Lindqvist in Dev-Build branch]
2019-08-14 11:53:23 -04:00
Josh Adams
2eb5796bba - Revamped the Platform Extension plugin support to go back to just passing one directory to ReadPluginsFromDirectory now that the directory swap allows it
#rb ben.marsh

[CL 7954514 by Josh Adams in Dev-Build branch]
2019-08-12 17:59:42 -04:00
Ben Marsh
2aff13a3b8 Add functionality to allow querying the available targets for a project from the editor, and use it to allow packaging client and server targets from the "Package Project" menu.
#rb none

[CL 7950582 by Ben Marsh in Dev-Build branch]
2019-08-12 11:21:45 -04:00
Joakim Lindqvist
86931fb171 Fixed incorrect check for non enigne modules which broke in 7839052.
Also changed local function to a member to fix build issue.

#rb none

[CL 7839081 by Joakim Lindqvist in Dev-Build branch]
2019-08-07 06:08:57 -04:00
Joakim Lindqvist
bd8a5b8c20 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

[CL 7839052 by Joakim Lindqvist in Dev-Build branch]
2019-08-07 05:54:00 -04:00
Josh Adams
84150c0c8f - Changed the directory structure from /Platforms/Engine to /Engine/Platforms (and .../Project/Platforms)
- Some fixes to get project platform files compiling
#rb ben.marsh

[CL 7294119 by Josh Adams in Dev-Build branch]
2019-07-12 16:09:23 -04:00
cmp-
f0992d9416 PR #5942: UBT: Fix duplicate platform check (Contributed by cmp-)
#rb none
#rnx
#jira UE-76215

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6988229 in //UE4/Release-4.23/... via CL 6988230
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7092860 by ben marsh in Dev-Build branch]
2019-06-19 10:47:00 -04:00
ben marsh
11f022162f Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 6944849 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7089689 by ben marsh in Dev-Build branch]
2019-06-19 08:52:32 -04:00
David Harvey
595de45445 PlatformExtensions:
- extensions are included in the solution
 - extension automation projects are included under Automation, and built as part of AutomationTool

#rb josh.adams

[CL 6651876 by David Harvey in Dev-Build branch]
2019-05-28 09:17:23 -04:00
Ben Marsh
7d3da16a4f UBT: Allow the project file generator to correctly handle multiple modules in programs.
#rb none

[CL 6378395 by Ben Marsh in Dev-Build branch]
2019-05-08 16:24:18 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
2019-05-03 08:03:23 -04:00
Ben Marsh
4d27210c01 UBT: Remove global function for determining whether a file is under an engine directory. This is now done via a trait that is propagated through construction of individual modules.
#rb none
#rnx
#fyi Josh.Adams

[CL 6076546 by Ben Marsh in Dev-Build branch]
2019-04-24 08:31:23 -04:00