48 Commits

Author SHA1 Message Date
adam kinge
cd76902991 - Fixed multi architecture check in OpenSSL.Build.cs
#rb trivial
#jira none

[CL 26203109 by adam kinge in 5.3 branch]
2023-06-22 22:23:41 -04:00
adam kinge
3a7028c229 Add an arm64+x86_64 iOS Simulator build of the OpenSSL 1.1.1t libcrypto and libssl libraries.
#jira UE-168571
#rb martins.mozeiko
#rnx

[CL 26189620 by adam kinge in 5.3 branch]
2023-06-22 14:50:31 -04:00
martins mozeiko
b7596b85c1 Upgrade openssl to 1.1.1t version.
#preflight 63f40ed7ff5afbbb03c3d01b

[CL 24393172 by martins mozeiko in ue5-main branch]
2023-02-23 18:58:27 -05:00
josh adams
1610c3bee3 UnrealArch/UnrealArchitectures changes
- Creates the UnrealArchitectures class, which wraps a list of UnrealArch objects
 - UnrealArch is a single architecture, expandable enum-like struct
 - There is no more concept of "no/default architecture", there is always a valid active architecture when building
 - Most uses of "string Architecture" are replaced with one of the two above, depending if multiple architectures are supported or not
 - UnrealArch has some platform-extensions for platform-specific naming (like Linux adds in LinuxName that turns, for instance, Arm64 -> aarch64-unknown-linux-gnueabi, which is used in folder names, etc)
 - UnrealArch has bIsX64 which can be used determine intel instruction set (as opposed to arm)
 - TargetRules class has an "Architecture" accessor that will return a single architecture if the active architectures is a single architecture, or throw an exception if multiple. This is useful in a majority of the cases where a paltform can only have a single architecture active in TargetRules (microsoft platforms, for instance, will create separate targets when compiling multiple architectures at once)
 - Added UnrealArchitectureConfig class, which contains all the architecture information for a platform (what architectures are supported, what ones are currently active for given project, etc)

#preflight 63c81fb5b065224750a1759e
#rb mike.fricker,roman.dzieciol,joe.kirchoff,dmytro.vovk,brandon.schaefer [various parts]
#p4v-preflight-copy 23562471

[CL 23829977 by josh adams in ue5-main branch]
2023-01-24 09:30:28 -05:00
joe kirchoff
e4b870ac3b Update external modules to add include paths to PublicSystemIncludePaths rather than PublicIncludePaths
#rnx
#rb trivial

[CL 22876134 by joe kirchoff in ue5-main branch]
2022-10-31 20:55:55 -04:00
UnrealBot
73409369c0 Branch snapshot for CL 21319338
[CL 21319338 in ue5-main branch]
2022-08-10 16:03:37 +00: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
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
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
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
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
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
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
joe conley
19c83dbe7b #jira UE-78449 - Enable SSL & OpenSSL modules on Lumin
#rb trivial

#ROBOMERGE-SOURCE: CL 7813288 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v388-7785529)

[CL 7813303 by joe conley in Main branch]
2019-08-06 14:39:30 -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
Michael Kirzinger
5f4e2b4396 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
Source: //UE4/Dev-Online 4860295

#rb none

[CL 4860323 by Michael Kirzinger in Main branch]
2019-01-31 15:08:35 -05:00