Commit Graph

63 Commits

Author SHA1 Message Date
David Harvey
5be13974fa HoloLens build rules: Engine modules part 1
#preflight 628cb15af057b981ca51fb81
#jira UE-149794
#rnx
#rb Jeff.Fisher

[CL 20361214 by David Harvey in ue5-main branch]
2022-05-25 04:04:01 -04:00
David Harvey
55344da8e2 Fix OpenSSL for Windows-based platform extensions
- windows-based platform extensions broke when old versions of openssl were deleted.
 - now they re-use the same settings as Win64

#jira UE-131865
#rnx
#preflight 623daddb5c488c89d6e008f6
#rb Jeff.Newquist
#fyi Pavel.Punsky

[CL 19510743 by David Harvey in ue5-main branch]
2022-03-25 08:44:24 -04:00
pavel punsky
b6146fca68 Delete old versions of openssl (after update to openssl-1.1.1n)
#test Tested on other projects

#ROBOMERGE-AUTHOR: pavel.punsky
#ROBOMERGE-SOURCE: CL 19489691 via CL 19499877 via CL 19500071
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19502094 by pavel punsky in ue5-main branch]
2022-03-24 16:20:45 -04:00
pavel punsky
df93a2fb22 Updating to openssl-1.1.1n on Win64, Linux
#test Tested on other projects

#ROBOMERGE-AUTHOR: pavel.punsky
#ROBOMERGE-SOURCE: CL 19474533 via CL 19489303 via CL 19489393
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19489920 by pavel punsky in ue5-main branch]
2022-03-23 20:50:04 -04:00
pavel punsky
a932da9715 Updating to openssl-1.1.1n on iOS, Mac, Android
Mac version contains arm64 support

#test Tested on other projects (EOS Voice)

#ROBOMERGE-AUTHOR: pavel.punsky
#ROBOMERGE-SOURCE: CL 19474216 via CL 19489199 via CL 19489276
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19489795 by pavel punsky in ue5-main branch]
2022-03-23 20:35:17 -04:00
jeff fisher
a8221a7553 UE-140418 Building EngineTest for Hololens from commandline fails with a fatal error LNK1181: cannot open input file
-Removing libcurl and openssl library references to files that do not exist.  Removing WITH_CURL=1 for Hololens.  If one attempts to use either at runtime they would fail.
-This allows EngineTest to build and cook.  Presumably some tests would fail, if we were able to run them at all (would require a hololens device hooked up to automation).
-A better fix would be to either build these libraries for hololens, both x64 and arm64 or to make them fully optional again, but that seems out of scope for 5.0.
-UE-141681 was created to follow up.
#jira UE-140418
#rb Steve.Smith
#lockdown Rolando.Caloca
#preflight 62018805846dda28ab0db3f5

#ROBOMERGE-OWNER: jeff.fisher
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 18893959 in //UE5/Release-5.0/... via CL 18894096 via CL 18894432
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)
#ROBOMERGE-CONFLICT from-shelf

[CL 18894586 by jeff fisher in ue5-main branch]
2022-02-07 17:17:22 -05:00
Rolando Caloca
d64b146cb2 UE5 - Remove platform
#rb Steve.Smith
#fyi Jules.Blok, Ryan.Durand, Ben.Marsh

[CL 17295935 by Rolando Caloca in ue5-main branch]
2021-08-24 19:27:11 -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
will damon
2da426907d Rebuild OpenSSL 1.1.1k Mac libraries as Universal 2 binaries.
#rb will.damon
#jira none
[FYI] dave.hunter, pavel.punsky
#rnx

#ROBOMERGE-OWNER: will.damon
#ROBOMERGE-AUTHOR: will.damon
#ROBOMERGE-SOURCE: CL 16418023 in //UE4/Release-4.27/... via CL 16418059 via CL 16419044 via CL 16419226
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v811-16416015)

[CL 16419233 by will damon in ue5-main branch]
2021-05-21 11:01:43 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -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
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -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
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -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
josh adams
62945c475f - Moving ThirdParty platform files to PlatformExtensions
#rb none

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 13048826 via CL 13048840 via CL 13048844
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13048916 by josh adams in Main branch]
2020-04-27 13:58:54 -04: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
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
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