Commit Graph

55 Commits

Author SHA1 Message Date
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
aurel cordonnier
d17d20ca36 Merge from Release-Engine-Test @ 16758890 to UE5/Main
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
nuno leiria
ea940d3794 Rename Linux folders to Unix where needed
#jira UE-99748
#preflight 60d0e0b778c3b00001e7cdd1
#rb brandon.schaefer, michael.sartain, arciel.rekman

[CL 16744169 by nuno leiria in ue5-main branch]
2021-06-22 12:04:15 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Josh Adams
69ba582188 - Removing Android 32-bit libraries, as a previous changelist removed support in UBT for it
#fyi chris.babcock,jack.porter
#rb none

[CL 15056352 by Josh Adams in ue5-main branch]
2021-01-12 17:02:01 -04:00
Josh Adams
b84453bc37 - Remove support for 32-bit Android, still have support for Arm64 and X64. Next checkin will delete the libs
#rb chris.babcock,jack.porter
#fyi chris.babcock,jack.porter

[CL 15056295 by Josh Adams in ue5-main branch]
2021-01-12 16:59:21 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -04:00
chris babcock
5f86badbca Update libwebsockets for Android to NDK 21
#jira UE-80046
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 11578756 in //UE4/Release-4.25/... via CL 11578767
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11585462 by chris babcock in Main branch]
2020-02-22 18:16:30 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ryan durand
5954c1f85b Updating remaining copyrights in Engine.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869250 via CL 10869537 via CL 10869906
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870965 by ryan durand in Main branch]
2019-12-26 23:08:00 -05: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
jeff newquist
1ff08f0bf7 Copying //UE4/Dev-Console to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none
#rnx

[CL 9445960 by jeff newquist in Dev-RenderPlat-Staging branch]
2019-10-07 10:54:53 -04:00
derek peterson
9920d1e2b5 Rebuilt libWebsockets for linux using scripts in //depot/3rdParty/libwebsocket/source/3.0/ and cross toolchain v14_clang-8.0.1-centos7
The previous build was missing some UE4-specific changes that are present in the source in //depot/3rdParty which caused the following SSL error when opening a secure websocket connection:
    Lws(Error): SSL_new failed: error:00000063:lib(0):func(0):reason(99)

[CODEREVIEW] scott.bowen, michael.sartain, brandon.schaefer, arciel.rekman
[FYI] james.brinkerhoff

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: derek.peterson
#ROBOMERGE-SOURCE: CL 9211298 via CL 9211313 via CL 9211327 via CL 9218895 via CL 9218908
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v455-9298202)

[CL 9329668 by derek peterson in Dev-Build branch]
2019-10-02 00:46:13 -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
derek peterson
1214202389 Rebuilt libWebsockets for linux using scripts in //depot/3rdParty/libwebsocket/source/3.0/ and cross toolchain v14_clang-8.0.1-centos7
The previous build was missing some UE4-specific changes that are present in the source in //depot/3rdParty which caused the following SSL error when opening a secure websocket connection:
    Lws(Error): SSL_new failed: error:00000063:lib(0):func(0):reason(99)

[CODEREVIEW] scott.bowen, michael.sartain, brandon.schaefer, arciel.rekman
[FYI] james.brinkerhoff


#ROBOMERGE-SOURCE: CL 9211298 via CL 9211313 via CL 9211327 via CL 9218895
#ROBOMERGE-BOT: (v443-9013191)

[CL 9218908 by derek peterson in Main branch]
2019-09-27 13:49:07 -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
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
Joakim Lindqvist
d26625d39d Updated module build configurations to follow our updated guidelines on using a library, you should always specify the full path to the library if you know it (in PublicAdditionalLibraries). This allows UBT to do up to date checking of the module and is faster.
If you still need to old behavior of searching for a library we use the new PublicSystemLibraries instead (used very sparingly).

Also updated conventions on importing Android libraries to use the newly introduced Android Architecture instead, which is always set to a valid architecuture (unlike Target.Architecture for the general case)

Lastly I updated some build.cs files that were doing filesystem enumeration or copying as they were being parsed, this is highly discouraged (partially because we cache filesystem operations but also it adds a cost to something we expect to be very fast). Any operations like this should be done as part of the build if they have to be done at all.

#rb none

[CL 7918851 by Joakim Lindqvist in Dev-Build branch]
2019-08-09 03:48:12 -04:00
Josh Adams
de9b4296a1 - More CIS fixes post-PlatformExtensions changes
#rb none

[CL 6368199 by Josh Adams in Dev-Build branch]
2019-05-08 10:34:57 -04:00
Josh Adams
451c92ac68 - Fixed up typo in PlatformExtension change in libWebSockets.Build.cs
#rb trivial

[CL 6275753 by Josh Adams in Dev-Build branch]
2019-05-03 11:21:56 -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
43317388da Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4867651 by Ben Marsh in Dev-Build branch]
2019-02-01 11:34:13 -05:00