Commit Graph

159 Commits

Author SHA1 Message Date
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
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
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
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
dyanikoglu
0b22064d23 PR #5971: Fix Stub Project Configuration Having Null Platform (Contributed by dyanikoglu)
#jira UE-76635
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 7229976 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7229994 by ben marsh in Main branch]
2019-07-08 13:55:31 -04:00
ben marsh
668b27b45d Fix incorrect filename when launching DebugGame targets from VSCode (or any target that overrides the undecorated configuration)
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7107524 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7107528 by ben marsh in Main branch]
2019-06-20 13:44:35 -04:00
ben marsh
882e90f7c9 Fix incorrect executable path in VSCode projects that use unique build environments.
#rb none
#jira UE-76277

#ROBOMERGE-SOURCE: CL 6989251 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6989254 by ben marsh in Main branch]
2019-06-14 11:48:44 -04:00
ben marsh
934accd842 Fix for broken IntelliSense data (PR# 5908 Thanks zzz77!)
#jira UE-75667
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 6988618 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6988619 by ben marsh in Main branch]
2019-06-14 10:00:13 -04:00
cmp-
4f950a3ad1 PR #5942: UBT: Fix duplicate platform check (Contributed by cmp-)
#rb none
#rnx
#jira UE-76215

#ROBOMERGE-SOURCE: CL 6988229 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6988230 by ben marsh in Main branch]
2019-06-14 08:17:02 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Stefan Boberg
8607ecb30d Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 6815521 by Stefan Boberg in Main branch]
2019-06-03 15:32:00 -04:00
David Harvey
a6aafea9d7 PlatformExtensions:
- extensions are included in the solution
 - extension automation projects are included under Automation, and built as part of AutomationTool

#rb josh.adams

[CL 6662967 by David Harvey in Main branch]
2019-05-29 06:35:09 -04:00
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
brian zaugg
5790d3ec3f #ocn - Hotfix from 6258862 to fix iOS link failing with argument list too long.
#ROBOMERGE-SOURCE: CL 6265085 via CL 6265224

[CL 6265383 by brian zaugg in Main branch]
2019-05-02 17:58:53 -04:00
jack porter
9df2286d36 Back out CL5935374 for UE-72100 as it causes 3 other issues
#jira UE-73066
#jira UE-73067
#jira UE-73073
#rb John.Mauney
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6042758 in //UE4/Release-4.22/... via CL 6042759
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 6044651 by jack porter in Dev-Core branch]
2019-04-22 21:10:36 -04:00
jack porter
a847d4ba9f Back out CL5935374 for UE-72100 as it causes 3 other issues
#jira UE-73066
#jira UE-73067
#jira UE-73073
#rb John.Mauney
#lockdown Cristina.Riveron

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

[CL 6042759 by jack porter in Main branch]
2019-04-22 19:39:57 -04:00
cosmin sulea
3ec6b8dfcf UE-72100 - tvOS For Distribution packages fail with Code Signing Error if made after a Development Build
#jira UE-72100
#rb Jack.Porter
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5935374 in //UE4/Release-4.22/... via CL 5935375
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5949980 by cosmin sulea in Dev-Core branch]
2019-04-17 14:02:51 -04:00
cosmin sulea
4dfd8f5ac7 UE-72100 - tvOS For Distribution packages fail with Code Signing Error if made after a Development Build
#jira UE-72100
#rb Jack.Porter
#lockdown Cristina.Riveron

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

[CL 5935375 by cosmin sulea in Main branch]
2019-04-17 06:05:55 -04:00
sorin gradinaru
43888bb83b UE-72058 tvOS: Project Packaged with CloudKit Support Crashes on Launch Due to Malformed Value in the Entitlement
#jira UE-72058
#tvOS
#4.22.1
#rb Jack.Porter

Manually integrated (robomerge errors) from CL5731997

When building on Mac, the packaging &  signing rely on the entitlements file.

- the values should correspond to those in the entitlements (take into account syntax differences). Fixed problems related to icloud-container-identifiers, ubiquity-container-identifiers and com.apple.developer.icloud-services
- ICloudContainerIdentifier added to the tvOS plist (previously it was added on iOS)
- added com.apple.developer.icloud-container-environment to the entitlements file, needed when signing the package
- shipping build with CloudKit should also have the push notifications enabled
- fixed an issue with com.apple.developer.associated-domains when the value is a string, not an array
- addding CODE_SIGN_ENTITLEMENTS in the project file

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5732468 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5735336 by sorin gradinaru in Dev-Core branch]
2019-04-04 09:07:09 -04:00
Sorin Gradinaru
97135fa96e UE-72058 tvOS: Project Packaged with CloudKit Support Crashes on Launch Due to Malformed Value in the Entitlement
#jira UE-72058
#tvOS
#4.22.1
#rb Jack.Porter

Manually integrated (robomerge errors) from CL5731997

When building on Mac, the packaging &  signing rely on the entitlements file.

- the values should correspond to those in the entitlements (take into account syntax differences). Fixed problems related to icloud-container-identifiers, ubiquity-container-identifiers and com.apple.developer.icloud-services
- ICloudContainerIdentifier added to the tvOS plist (previously it was added on iOS)
- added com.apple.developer.icloud-container-environment to the entitlements file, needed when signing the package
- shipping build with CloudKit should also have the push notifications enabled
- fixed an issue with com.apple.developer.associated-domains when the value is a string, not an array
- addding CODE_SIGN_ENTITLEMENTS in the project file

[CL 5732468 by Sorin Gradinaru in Main branch]
2019-04-04 07:18:29 -04:00
Cosmin Sulea
50b9f22efc ROBOMERGE conflict 5630547 resolved UE-71953 - Blueprint iOS projects can't package For Distribution
#jira UE-71953
#rb Jack.Porter

[CL 5630708 by Cosmin Sulea in Main branch]
2019-03-28 12:09:05 -04:00
jules blok
d2d37aa911 Escape all paths when generating VS project filter files
#jira UE-71727
#rb Jack.Porter

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

[CL 5439986 by jules blok in Main branch]
2019-03-18 20:15:53 -04:00