Commit Graph

71 Commits

Author SHA1 Message Date
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
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
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -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
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
jeff newquist
3f01d9be15 Fix PhysX build caused by platform setting not choosing msbuild and broken CMAKE_MODULE_PATH
#rb Benn.Gallagher
#jira UE-90331
#rnx

#ROBOMERGE-SOURCE: CL 12675436 in //UE4/Release-4.25/... via CL 12675437 via CL 12675441
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12675449 by jeff newquist in Main branch]
2020-04-08 12:58:47 -04:00
brandon schaefer
1afa7cf4d1 Handle case when the *.so is attempted to be stripped into debug mulitple times
#jira none
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-SOURCE: CL 12356562 in //UE4/Release-4.25/... via CL 12356563
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12356564 by brandon schaefer in Main branch]
2020-03-20 20:24:50 -04:00
brandon schaefer
24ebe9d7bc Split debugging symbols from PhysX/APEX for Linux
Add PhysX/APEX debug as a DebugNonUFS file for runtime depends

#jira UE-90116
#rb Luke.Thatcher, Arciel.Rekman

#ROBOMERGE-SOURCE: CL 12340149 in //UE4/Release-4.25/... via CL 12340173
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12340184 by brandon schaefer in Main branch]
2020-03-20 13:09:40 -04:00
anthony bills
f31d99a3f9 Add BuildCMakeLib UAT automation script for building third party libraries that use CMake.
- This is based off BuildPhysx.Automation.cs and could be unified with this in the future.
- Update some CMakeLists.txt to support this.
- Convert ICU CMakeLists.txt to support cmake 3.5.2 that ships with the engine.
- Fix up some whitespace in BuildPhysX.

[at]brian.white
#jira UE-81798

#ROBOMERGE-SOURCE: CL 11597283 in //UE4/Release-4.25/... via CL 11597290
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11597322 by anthony bills in Main branch]
2020-02-25 07:23:55 -05:00
chris babcock
89806504ee Update Android toolchain to NDK 21 (20 also supported for x86_64) additional files
#jira UE-80046
#ue4
#android
#rb Bradon.Schaefer


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

[CL 11578380 by chris babcock in Main branch]
2020-02-21 15:19:40 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
brandon schaefer
41ad60e53c Generate a --build-id for physx
#jira UE-82735
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-SOURCE: CL 9892992 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v557-9890184)

[CL 9892993 by brandon schaefer in Main branch]
2019-10-30 12:52:38 -04: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
Ben Marsh
b6039a9873 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419420 by Ben Marsh in Dev-Build branch]
2019-10-04 11:20:44 -04:00
brandon schaefer
7d445c1103 Fix incorrect merge (Thanks dyanikoglu! PR #6256)
#jira UE-81260
#rb none
[FYI] Ben.Marsh
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9390019 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9390020 by brandon schaefer in Main branch]
2019-10-03 09:56:14 -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
ben marsh
6a936ba1b9 Copying //UE4/Dev-RenderPlat-Staging[at]8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 8684840 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8752957 by ben marsh in Dev-Build branch]
2019-09-17 11:58:25 -04: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
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -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
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -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
0f79d0e564 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4979967 by Ben Marsh in Dev-Build branch]
2019-02-12 21:08:26 -05:00