Commit Graph

28 Commits

Author SHA1 Message Date
dave hunter
d6ba9d85cc Copy libembree3.3.dylib and libtbb.12.dylib to the build output folder
#jira UE-112904
#rb brandon.schaefer
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 15943110 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)

[CL 15948407 by dave hunter in ue5-main branch]
2021-04-07 20:03:00 -04:00
brandon schaefer
d06ebb7621 Fix Linux Linker error from horde Issue 60200
#jira none
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 15934861 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15934863 by brandon schaefer in ue5-main branch]
2021-04-06 17:06:54 -04:00
brandon schaefer
caf3ad4e55 Fix InstallBuilds for Linux (and likely other platforms)
#jira UE-112839
#rb Jonathan.Adamczewski
[FYI] Jonathan.Adamczewski
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 15934281 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15934671 by brandon schaefer in ue5-main branch]
2021-04-06 16:47:37 -04:00
dave hunter
b982cb6832 Embree 3 is now available on mac
This gets embree 3 added to the mac.  The original distribution contained the following symlinks which I have removed:
- libembree3.dylib
- libtbb.12.dylib
- libtbb.dylib

libembree3.3.dylib was looking for libtbb.12.dylib.  Rather than patch it or copy the symlinks, I renamed libtbb.12.1.dylib to libtbb.12.dylib which seems to resolve things, although it is a little dirty.

#rb brandon.schaefer
[FYI] daniel.wright, will.damon, rolando.caloca
#jira UE-112346
#rnx

#ROBOMERGE-SOURCE: CL 15915724 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15920147 by dave hunter in ue5-main branch]
2021-04-05 14:19:22 -04:00
brandon schaefer
15eb7562ce Actually mark for add on Include header
#jira none
#rb none
[FYI] Ryan.Schmidt

#ROBOMERGE-SOURCE: CL 15837954 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v785-15821902)

[CL 15837955 by brandon schaefer in ue5-main branch]
2021-03-25 23:49:52 -04:00
brandon schaefer
1ce8585731 Embree + TBB rebuild for Linux. Needed to rebuild against libc++
#jira none
#rb none
[FYI] Michael.Sartain

#ROBOMERGE-SOURCE: CL 15836085 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v785-15821902)

[CL 15836103 by brandon schaefer in ue5-main branch]
2021-03-25 19:49:51 -04:00
brandon schaefer
8bb8e4a36d Back out changelist 15807872, causing Editor to not startup
Was likely not noticed due to previous way keeping this dll in Engine/Binaries/Win64/embree3.dll. Needs to be removed to reproduce

#jira none
#rb none
[FYI] Daniel.Wright

#ROBOMERGE-SOURCE: CL 15813728 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15814455 by brandon schaefer in ue5-main branch]
2021-03-24 21:25:27 -04:00
daniel wright
a04f6e385f Moved Embree3 dll's to Binaries/Thirdparty to hopefully solve inconsistent Incremental build failures (skips dll copy in build dependency)
#ROBOMERGE-SOURCE: CL 15807872 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15813888 by daniel wright in ue5-main branch]
2021-03-24 20:55:18 -04:00
daniel wright
718627f372 Disable Embree3 for Mac
#ROBOMERGE-SOURCE: CL 15805586 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15810217 by daniel wright in ue5-main branch]
2021-03-24 18:13:04 -04:00
Daniel Wright
04a06b7838 Workaround for duplicate tbb12.dll
[CL 15791168 by Daniel Wright in ue5-main branch]
2021-03-23 23:09:29 -04:00
daniel wright
a348ce2488 Hopeful fix for Embree Mac build
#ROBOMERGE-SOURCE: CL 15787335 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15790784 by daniel wright in ue5-main branch]
2021-03-23 22:43:22 -04:00
daniel wright
07ca06d0be Embree 3.12.2
#ROBOMERGE-SOURCE: CL 15784439 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15789950 by daniel wright in ue5-main branch]
2021-03-23 21:46:44 -04:00
brandon schaefer
efe06157fe Fix Embree logic, shared libraries should be in Engine/Binaries, moving Linux parts there for now
#jira UE-111648
#rb none
[FYI] Michael.Sartain

#ROBOMERGE-SOURCE: CL 15782584 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15789900 by brandon schaefer in ue5-main branch]
2021-03-23 21:45:07 -04:00
Brandon Schaefer
e7f8b29c59 Build Embree for Linux
#jira none
#rb none
[FYI] Michael.Sartain, Will.Damon

#ROBOMERGE-OWNER: Brandon.Schaefer
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 15750544 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15754096 by Brandon Schaefer in ue5-main branch]
2021-03-20 06:46:36 -04:00
Michael Sartain
30d0914117 Add Linux x86_64 build scripts for Embree v2.7.0 and v2.14.0
#fyi Brandon.Schaefer, Will.Damon
#rb none
#jira none

[CL 15744597 by Michael Sartain in ue5-main branch]
2021-03-18 21:56:50 -04:00
danny couture
507a485b82 Fix missing tbb12.dll when using OpenImageDenoise preventing the GPULightmass plugin from loading
#rb Yujiang.Wang
#robomerge Release-5.0-EarlyAccess

[CL 15514319 by danny couture in ue5-main branch]
2021-02-24 11:17:36 -04:00
Yujiang Wang
154a1c20ac Integrate Intel OpenImageDenoise 1.3.0
[CL 15484947 by Yujiang Wang in ue5-main branch]
2021-02-20 23:58:08 -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
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
JeanMichel Dignard
de5ea701c5 Fixed IntelTBB include path case causing compilation issues on native linux.
#jira UE-103347
#rb none
#fyi sebastien.lussier

[CL 14817324 by JeanMichel Dignard in ue5-main branch]
2020-11-27 11:24:17 -04:00
Sebastien Lussier
1cbd59cffa IntelTBB module - Only tbbmalloc is under the arm64 folder
#fyi steve.smith, jason.bestimt

[CL 14764960 by Sebastien Lussier in ue5-main branch]
2020-11-17 14:35:35 -04:00
Sebastien Lussier
1090cb8f27 IntelTBB Module
* Added libtbb to PublicAdditionalLibraries
* Properly disable auto linking
* General cleanup
#rb danny.couture

[CL 14754631 by Sebastien Lussier in ue5-main branch]
2020-11-16 11:04:09 -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
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
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00