Commit Graph

84 Commits

Author SHA1 Message Date
Zousar Shaker
a27a7dba1a Shift Win64 over to libcurl 7.83.1 w/ nghttp2 enabled.
#rb devin.doucette, michael.kirzinger
#preflight 6294f9233f058e13b5c07028

[CL 20431894 by Zousar Shaker in ue5-main branch]
2022-05-30 13:14:33 -04:00
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
Zousar Shaker
b79e318a1a Add build scripts and pre-built libs for libcurl 7.83.1
#rb devin.doucette, michael.kirzinger, ian.fox
#preflight 628cf7ea7778f10598b216c3

[CL 20350183 by Zousar Shaker in ue5-main branch]
2022-05-24 12:26:11 -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
Martin Ridgers
2a360f2f6d Libcurl 7.75.0 for Mac; universal, minimum version 10.15, LDAP-disabled.
#ushell-cherrypick of 18707361 by Martin.Ridgers
#preflight 61efa6a04726f50c1117374f

[CL 18720495 by Martin Ridgers in ue5-main branch]
2022-01-25 02:41:48 -05: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
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -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
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
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
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -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
Josh Adams
426d5328ad - Deleted Win32 ThirdParty libs (left Win32 includes around as they aren't that big)
- Deleted all WebRTC Win32 files, even includes, because the shear number of files removed is helpful (VS indexing, etc etc)

[CL 14261614 by Josh Adams in ue5-main branch]
2020-09-04 14:14:28 -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
michael kirzinger
eeeec7d4f4 Fix curl build script
Updated linux libcurl, now with the patch to fix curl_multi_perform blocking actually applied

[at]brandon.schaefer, [at]rob.cannaday

#ROBOMERGE-SOURCE: CL 12758522 via CL 12758724 via CL 12758990
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12759057 by michael kirzinger in Main branch]
2020-04-13 13:34:53 -04:00
michael kirzinger
fb3375673a Workaround libcurl blocking in curl_multi_perform in the case that multiple requests are in flight to the same domain and one of the dns queries times out
[REVIEW] [at]michael.sartain, [at]brandon.schaefer, [at]louisphilippe.seguin


#ROBOMERGE-SOURCE: CL 11360958 via CL 11366210 via CL 11366310 via CL 11366430
#ROBOMERGE-BOT: (v654-11333218)

[CL 11366616 by michael kirzinger in Main branch]
2020-02-11 19:49:20 -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
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