Commit Graph

113 Commits

Author SHA1 Message Date
chad garyet
47c6b489eb change DefaultWindowsSdkVersion back to 10.0.16299.0
#jira none
#rb none
[FYI] ben.marsh

#ROBOMERGE-SOURCE: CL 7662385 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7662393 by chad garyet in Main branch]
2019-07-30 15:20:06 -04:00
ben marsh
8f8dd82f78 Minor fallout from previous change.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321405 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321407 by ben marsh in Main branch]
2019-07-16 08:46:19 -04:00
ben marsh
b9cd13f663 UBT: Convert some windows target settings to properties which take on default values based on other properties. This fixes logic for determining whether live coding is enabled for a target, which needs to know the target type.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321402 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321404 by ben marsh in Main branch]
2019-07-16 08:45:47 -04:00
jeff fisher
ba53539174 UE-76509 Packaging for Hololens doesn't work in an Installed build
-fixes hololens arm64 packaging error about mspdbcore.dll, this affected non-installed builds as well
-several other jiras are linked from that one that will still remain for packaging from installed builds
-(actually implemented by joe, reviewed and tested by me)
#rb joe.conley
#jira UE-76509

#ROBOMERGE-SOURCE: CL 7265359 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7265361 by jeff fisher in Main branch]
2019-07-10 14:33:32 -04:00
ben marsh
7d0bc33e91 Disable remote execution of ISPC. Suspect this is causing spurious mismatched case issues.
#rb none
#rnx
#jira UE-76072

#ROBOMERGE-SOURCE: CL 7173969 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7173985 by ben marsh in Main branch]
2019-06-22 20:10:28 -04:00
arne schober
40aef1fcc0 FnMerge - Upgrade ISPC version and add missing TPS File.
#RB none
[FYI] Jeff.Rous


#ROBOMERGE-SOURCE: CL 7112116
#ROBOMERGE-BOT: (v367-6836689)

[CL 7112121 by arne schober in Main branch]
2019-06-20 16:56:18 -04:00
ben marsh
8acb93df64 Fix errors building Clang targets.
#rb none
#rnx
#jira UE-76490

#ROBOMERGE-SOURCE: CL 7098139 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7098159 by ben marsh in Main branch]
2019-06-19 18:54:17 -04:00
ben marsh
7ef5343fb4 Fix changes made in Hololens integration causing Visual Studio Express to crash when compiling.
#rb none
[FYI] Joe.Conley
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7065060 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7065077 by ben marsh in Main branch]
2019-06-18 13:38:04 -04:00
ben marsh
5e730ab1be Live Coding: Disable ICF and symbol stripping when live coding is enabled.
#jira UE-75978
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 6956986 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966777 by ben marsh in Main branch]
2019-06-12 23:22:08 -04:00
ben marsh
c858dd6574 UBT: Fix exception when querying older versions of Visual Studio that do not implement ISetupInstanceCatalog.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 6956965 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966776 by ben marsh in Main branch]
2019-06-12 23:22:07 -04:00
ben marsh
526f66d0c3 Remove code that reads solution file when determining which compiler to use. This is very slow. We already have multiple ways of specifying which IDE to use.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 6956821 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966771 by ben marsh in Main branch]
2019-06-12 23:21:57 -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 Lentine
f9b3324b32 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
#rb none
#rnx

[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -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
ryan durand
aec4c2fb09 UE-72225
Merging in fixes to better support SNDBS in UBT with use of cl-filter.

#lockdown ben.marsh
#rnx
#rb none
#jira UE-72225

#ROBOMERGE-SOURCE: CL 6489426 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6489461 by ryan durand in Main branch]
2019-05-15 13:09:30 -04:00
cmp-
73e7fc39f1 PR #5786: UE-73480: search for MSBuild in VS2019 paths (Contributed by cmp-)
#jira UE-74018
#rb none

#ROBOMERGE-SOURCE: CL 6265880 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317333 by ben marsh in Main branch]
2019-05-06 11:32:35 -04:00
ben marsh
91f6f04a3a Fix default Clang toolchain version being 7.1.0 rather than 7.0.1.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 5824508 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5824511 by ben marsh in Main branch]
2019-04-10 18:28:19 -04:00
david harvey
14ed52c680 Upgrade to VC 15.9.11 toolchain - includes PGO optimization bug fix.
#rb ben.woodhouse
[FYI] ben.marsh, chris bunner, nick darnell


#ROBOMERGE-SOURCE: CL 5806911 via CL 5806913 via CL 5806914 via CL 5806966

[CL 5806970 by david harvey in Main branch]
2019-04-09 05:17:08 -04:00
ben marsh
934945e3d4 Don't use a Visual Studio Express installation even if it's our preferred toolchain version.
#rb none
#jira UE-72305

#ROBOMERGE-SOURCE: CL 5767591 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5767593 by ben marsh in Main branch]
2019-04-05 15:18:12 -04:00
ben marsh
4323fb674e UBT: Always prefer 64-bit toolchains over 32-bit toolchains. Prevents Visual Studio Express versions being selected over Pro versions.
#rb none
#jira UE-72305

#ROBOMERGE-SOURCE: CL 5766636 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5766637 by ben marsh in Main branch]
2019-04-05 13:41:47 -04:00
ben marsh
fbebd9cd40 Add additional logging for Visual Studio version, to help track down problems with Visual Studio Express.
#rb none
#jira UE-72305

#ROBOMERGE-SOURCE: CL 5749069 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5749075 by ben marsh in Main branch]
2019-04-04 16:40:23 -04:00
ben marsh
813b70384f UBT: Sort the installed versions of Visual Studio to weight against Express versions being chosen.
#rb none
#jira UE-72305

#ROBOMERGE-SOURCE: CL 5746419 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5746421 by ben marsh in Main branch]
2019-04-04 14:36:41 -04:00
john abercrombie
71ad729861 Raise the minimum value for PCH compilation to avoid compiler errors in VS2017
#ROBOMERGE-SOURCE: CL 5612064 via CL 5614008

[CL 5614083 by john abercrombie in Main branch]
2019-03-27 18:23:09 -04:00
jeff fisher
39dacb55c6 Back out changelist 5417701
-This fix breaks the ddc build, which is more important.
#rb build
#jira UE-67120

#ROBOMERGE-SOURCE: CL 5423419 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5423420 by jeff fisher in Main branch]
2019-03-16 13:39:22 -04:00
jeff fisher
44b2c755e4 UE-67120 Editor crash on startup after enabling Morpheus plugin...
UE-67297 ShaderCompiler crash when opening the editor with Morpheus plugin and project setting enabled
-Moved this shader file out of platform shader directory into the  plugin shaders (it isn't actually for use on that platform, its used in the editor).  Sadly we still need to use it from engine code if the shader file exists because a postprocesspass cannot be defined in a plugin and I couldn't find a way to pull the shader from the plugin and use it in the pass so I had to hardcode the shader path mapping for this plugin in launchengineloop.  A rendering refactor is coming along that will make postprocess passes more like other passes, so it makes sense to defer refactoring this until after that.
#jira UE-67120 UE-67297
#rb Ryan.Vance

#ROBOMERGE-SOURCE: CL 5417701 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5417707 by jeff fisher in Main branch]
2019-03-15 12:53:13 -04:00