Commit Graph

216 Commits

Author SHA1 Message Date
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
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
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
jack porter
a51262a359 Prevent iOS Xcode project generation from adding a default bundle identifier to the UE4.xcodeproj file which caused issues with Blueprint projects on Mac.
#jira UE-77015
#rb Josh.Adams
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 8113618 in //UE4/Release-4.23/... via CL 8113621
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8152485 by jack porter in Dev-Build branch]
2019-08-20 23:34:43 -04:00
Ben Marsh
7df7a82fd2 UBT: Add an error when trying to build the editor in an unsupported configuration.
#rb none

[CL 8126478 by Ben Marsh in Dev-Build branch]
2019-08-20 11:35:51 -04:00
Ben Marsh
b84e7e5757 Missing copyright notices.
#rb none
#rnx

[CL 8124531 by Ben Marsh in Dev-Build branch]
2019-08-20 09:26:18 -04:00
jack porter
a218bce175 Prevent iOS Xcode project generation from adding a default bundle identifier to the UE4.xcodeproj file which caused issues with Blueprint projects on Mac.
#jira UE-77015
#rb Josh.Adams
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 8113618 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8113621 by jack porter in Main branch]
2019-08-19 10:22:42 -04:00
Ben Marsh
e9bdc9854b Fix C# 7 anachronisms.
#rb none
#rnx

[CL 8095863 by Ben Marsh in Dev-Build branch]
2019-08-16 13:49:52 -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
e594514033 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

#ROBOMERGE-SOURCE: CL 7865223 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865277 by joakim lindqvist in Main branch]
2019-08-08 05:06:56 -04:00
joakim lindqvist
67315195b4 VsCode - Intellisense complaining about incorrect macro definitions
Modified OpenColor header to check if GNUC is defined before using it (as it already does a few lines below). And thus removed the global invalid GNUC define which confuses VsCode.

Fixed up spaces in define that also confused VsCode.

#rb simon.therriault
[fyi] ben.marsh

#jira UE-76985
(ushell-p4-cherrypick of 7288701 by Joakim.Lindqvist)

#ROBOMERGE-SOURCE: CL 7865169 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865209 by joakim lindqvist in Main branch]
2019-08-08 05:06:21 -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
ben marsh
2aed687fc8 UBT: Fix the path to the solution options file for VS2019, so we can collapse all the projects and select the right configuration by default.
#rb none
#jira UE-78293

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/... via CL 7709084
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7834937 by ben marsh in Dev-Build branch]
2019-08-06 22:22:18 -04:00
Joakim Lindqvist
9bd3c52a8e Added option to VSCode generator to include all files (disabled by default).
#rb none

[CL 7785859 by Joakim Lindqvist in Dev-Build branch]
2019-08-06 07:30:57 -04:00
ben marsh
a4132cf4ff UBT: Fix the path to the solution options file for VS2019, so we can collapse all the projects and select the right configuration by default.
#rb none
#jira UE-78293

#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7709084 by ben marsh in Main branch]
2019-08-02 14:44:48 -04:00
brandon schaefer
c0b6ef0ac8 Remove conditions on include paths for QtCreator PR #5960 (thanks PhilBax!)
#jira UE-76592
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 7475168 in //UE4/Release-4.23/... via CL 7475169
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v372-7473910)

[CL 7515539 by brandon schaefer in Dev-Build branch]
2019-07-22 23:09:35 -04:00
brandon schaefer
8788b3b137 Remove conditions on include paths for QtCreator PR #5960 (thanks PhilBax!)
#jira UE-76592
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-SOURCE: CL 7475168 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7475169 by brandon schaefer in Main branch]
2019-07-22 11:14:59 -04:00
ben marsh
aa4ce98c42 Prevent LiveCodingConsole being built twice if bBuildLiveCodingConsole = true in BuildConfiguration.xml, and it's the target being built from Visual Studio.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7321488 in //UE4/Release-4.23/... via CL 7321490
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7370119 by ben marsh in Dev-Build branch]
2019-07-17 03:40:35 -04:00
ben marsh
1c006fcfd4 Prevent LiveCodingConsole being built twice if bBuildLiveCodingConsole = true in BuildConfiguration.xml, and it's the target being built from Visual Studio.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321488 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321490 by ben marsh in Main branch]
2019-07-16 09:02:16 -04:00