Commit Graph

60 Commits

Author SHA1 Message Date
Aidan Possemiers
19c966c925 Adding WerbRTC binaries for upgrade to WebRTC M96. Currently not enabled by default.
#JIRA UE-153246
#rb Luke.Berminham, Ivan.Sidarau
#fyi Mattias.Jansson, Pavel.Punsky
#preflight 6286e0dc9016c6dd89a5dda5

[CL 20315916 by Aidan Possemiers in ue5-main branch]
2022-05-22 19:35:22 -04:00
David Harvey
41557382a7 Main media plugins build for Windows-based platform extensions.
- Windows-based platform extensions should not use MfMedia player now - should change to WmfMedia for the time being.

#jira UE-131865
#rb Eric.McDaniel
#preflight 62347b390820efd09469a25a

[CL 19434256 by David Harvey in ue5-main branch]
2022-03-18 08:43:12 -04:00
pavel punsky
c3950e90b7 Fix license header
#jira UE-143836
#test none
#rb none
#preflight none

#ROBOMERGE-AUTHOR: pavel.punsky
#ROBOMERGE-SOURCE: CL 19254783 in //UE5/Release-5.0/... via CL 19258148
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263551 by pavel punsky in ue5-main branch]
2022-03-04 03:50:43 -05:00
aidan possemiers
697730c398 Fix issue with RTTI being missing in Linux binaries.
#JIRA UE-143839
#rb Luke.Bermingham
[FYI] Mattias.Jansson
#preflight 621c2c6cbb51b08242427abe
#preflight 621c2cb42b69aa5e59587317
#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: aidan.possemiers
#ROBOMERGE-SOURCE: CL 19173044 in //UE5/Release-5.0/... via CL 19173197
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19173338 by aidan possemiers in ue5-main branch]
2022-02-28 09:48:15 -05:00
aidan possemiers
78a4f1d2fe Update webrtc headers to match libraries and update Linux WebRTC binaries to match headers.
#JIRA UE-143654
#rb Luke.Bermingham, Pavel.Punsky
[FYI] Mattias.Jansson
#preflight 62173558db60b6b5920bfe98
#lockdown Mitchell.Willson

#ROBOMERGE-AUTHOR: aidan.possemiers
#ROBOMERGE-SOURCE: CL 19114534 in //UE5/Release-5.0/... via CL 19114747
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19152890 by aidan possemiers in ue5-main branch]
2022-02-25 14:20:54 -05:00
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
Nick Pace
db7ffa0445 Integrate Dev-TensorWorks PixelStreaming/AVEncoder changes into Main
#JIRA UCS-1831
#fyi luke.bermingham, marco.anastasi
#rb aidan.possemiers

[CL 17920208 by Nick Pace in ue5-main branch]
2021-10-26 01:05:06 -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
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
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
3dcb3c77d2 fixing copyright notice
#fyi Nick.Pace
#robomerge 4.27

[CL 16163729 by aurel cordonnier in ue5-main branch]
2021-04-29 19:55:10 -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
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -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
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
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
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
Ryan Durand
54168a659e Updating more copyrights to remove years.
#rnx
#rb none
#jira none

[CL 10898929 by Ryan Durand in Main branch]
2020-01-07 17:07:47 -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
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
ben marsh
5d2e4bc196 Fix WebRTCProxy compile errors with VS2019.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5990912 in //UE4/Release-4.22/... via CL 5990937
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6000161 by ben marsh in Dev-Build branch]
2019-04-18 21:29:24 -04:00