Commit Graph

1202 Commits

Author SHA1 Message Date
Ben Marsh
90450af082 Disable targets added just to give nice error messages by default when determining what should be built by default. Fixes trying to build SCW through its dummy target on PS4.
[CL 2655447 by Ben Marsh in Main branch]
2015-08-13 18:56:36 -04:00
Peter Sauerbrei
17b5b9cea5 add log display type as part of each log message
add -verbose=Level argument to be able to specify the verbosity level of logging, defaults to Log
#codereview ben.marsh, robert.manuszewski, paul.fazio

[CL 2654467 by Peter Sauerbrei in Main branch]
2015-08-13 09:00:22 -04:00
Ben Marsh
93352cb225 Prevent trying to build ShaderCompileWorker in non-Win64 platforms (Win64 is the only platform you can run the editor on directly).
[CL 2654464 by Ben Marsh in Main branch]
2015-08-13 08:55:10 -04:00
Ben Marsh
c8999e6093 Make sure the version manifests and file names are serialized to the UBT makefile. If they're not written out, we won't be able to update the *.modules files correctly when switching between targets, unless we're discarding the makefile.
#codereview Jamie.Dale

[CL 2653646 by Ben Marsh in Main branch]
2015-08-12 17:52:25 -04:00
Michael Trepka
d5a4db5f86 Always compile ShaderCompileWorker along with the editor in Xcode
[CL 2653183 by Michael Trepka in Main branch]
2015-08-12 14:26:37 -04:00
Ben Marsh
6b1b6d9bf1 Always compile ShaderCompileWorker along with the editor.
[CL 2652931 by Ben Marsh in Main branch]
2015-08-12 12:13:26 -04:00
Ben Marsh
f4855c823b Avoid throwing exceptions if the path to .buildmutex files doesn't exist.
[CL 2652920 by Ben Marsh in Main branch]
2015-08-12 12:01:25 -04:00
Ori Cohen
e13700b667 Added the ability to turn on release physx libs for all configurations
[CL 2652723 by Ori Cohen in Main branch]
2015-08-12 10:22:52 -04:00
Jeff Campeau
6e5b895a54 Disable DualShock and Morpheus support for VS2015
[CL 2651897 by Jeff Campeau in Main branch]
2015-08-11 17:29:08 -04:00
Jeff Campeau
35d4842420 Disable some warnings for VS2015
[CL 2651883 by Jeff Campeau in Main branch]
2015-08-11 17:19:03 -04:00
Mark Satterthwaite
d0e5c59013 Remove unnecessary variable declaration to silence unused warning.
[CL 2651432 by Mark Satterthwaite in Main branch]
2015-08-11 14:02:16 -04:00
Mark Satterthwaite
934f141a98 Update Distcc/DMUCS integration for new version of DistCode - must provide the correct DistProp & server for DMUCS and acquire the number of build hosts via Xcode on OS X.
[CL 2651279 by Mark Satterthwaite in Main branch]
2015-08-11 12:16:48 -04:00
Ben Marsh
7f9774d740 Make it clearer that TargetReceipt.Read can fail if the file doesn't exist or is formatted incorrectly.
[CL 2649965 by Ben Marsh in Main branch]
2015-08-10 16:07:05 -04:00
Mike Fricker
ff488db20f Fixed UHT compiled with older compiler when targeting Visual Studio 2015
#codereview jeff.campeau

[CL 2649768 by Mike Fricker in Main branch]
2015-08-10 14:28:15 -04:00
Ben Marsh
ddffc7e3dd Fix PCH environment changing when a module has an include path dependency, but the decision to compile that module is dependent on something else. Now always generates a consistent compile environment regardless of whether the other module binary is actually built.
#jira UE-19783

[CL 2649648 by Ben Marsh in Main branch]
2015-08-10 13:10:18 -04:00
Mike Fricker
0aadee3222 [INTEGRATE] Compile times: Fixed game plugin modules not able to use engine shared PCHs
- This change greatly improves compile times for game plugin modules
- Game modules never depend on the game itself, so there was no reason not to use shared PCHs by default

[CL 2649311 by Mike Fricker in Main branch]
2015-08-10 08:38:21 -04:00
Mike Fricker
659cb89e9c [INTEGRATE] UnrealBuildTool fixes for small modules
- Fixed small game-specific plugins always using non-unity and getting a unique PCH

- You can now override the default behavior of UBT which compiles small game modules for "fast iteration"
        - Many small game modules have a low frequency of iteration, and never need a unique PCH or non-unity enabled
        - You can use the following module-specific variables to override the default behavior:

                      MinSourceFilesForUnityBuildOverride = 1;
                      MinFilesUsingPrecompiledHeaderOverride = BuildConfiguration.MinFilesUsingPrecompiledHeader;

[CL 2648185 by Mike Fricker in Main branch]
2015-08-07 13:58:49 -04:00
Steve Robb
3ad72e0d88 UBT now rebuilds makefile when hotreloading a different module.
#codereview robert.manuszewski

[CL 2647884 by Steve Robb in Main branch]
2015-08-07 10:19:42 -04:00
James Moran
a892538094 Fix handling of spaces in emcc path.
Fix Optimizer path on Mac
fix jira-19532 part 2

[CL 2647762 by James Moran in Main branch]
2015-08-07 07:10:38 -04:00
Wes Hunt
cefa87e4b7 Ionic.zip code import
* Moving Ionic.Zip source code into UE4 from UE4 source.
* Only one left should be in Binaries/DotNET.
* Moving TPS info to source location.
* Deleting several copies that were floating around.

Assembly Resolve Refactor
* Added AssemblyUtils.InstallAssemblyResolver to handle resolving of known assemblies that may not exist in the same folder as the referencing assembly.
* This is now installed by UAT and UBT, which should handle all needs to load Ionic.Zip and RPCUtility.exe from scripts that install into subfolders of Binaries/DotNET.
* Other assemblies can be added easily as necesary, centralizing the location where this is handled.
* Removed AssemblyResolver from RPCUtilHelper as UBT handles it automatically now.
* Removed Ionic.Zip references from projects that weren't really using it.
#codereview:ben.marsh

[CL 2646891 by Wes Hunt in Main branch]
2015-08-06 15:55:44 -04:00
Steve Robb
e446302541 Fix to module name comparison when checking files to rebuild.
#codereview robert.manuszewski

[CL 2646563 by Steve Robb in Main branch]
2015-08-06 12:14:25 -04:00
Chris Babcock
9c6add976a Keep the last export of each path from .bash_profile instead of the first one if not set in ini
#jira UE-19619
#ue4
#android
#codereview Michael.Trepka,Mark.Satterthwaite

[CL 2645674 by Chris Babcock in Main branch]
2015-08-05 18:10:38 -04:00
Josh Markiewicz
f8d83447e1 #Integration FN->Main from CL#2642868
Engine Source changes

[CL 2645403 by Josh Markiewicz in Main branch]
2015-08-05 15:54:57 -04:00
Chris Babcock
28d1b83a10 Use gnu-libstdc++ 4.8 for NDK level 19, and allow 4.9 for higher NDK levels
Only use ld.gold for Clang 3.6 if unity build
#jira UE-10647
#ue4
#android

[CL 2644345 by Chris Babcock in Main branch]
2015-08-04 19:58:25 -04:00
Dmitry Rekman
3d4c157110 Revert the previous change and disable XGE again.
- Modular builds (editor, UT server) seem to be broken by this since FixDeps step probably is not listing its prerequisites correctly.

#codereview Ben.Marsh

[CL 2644331 by Dmitry Rekman in Main branch]
2015-08-04 19:39:07 -04:00