Commit Graph

118 Commits

Author SHA1 Message Date
Ben Marsh
a5f534451b Remove the ENGINE_VERSION define from Version.h and ObjectVersion.cpp; it's superceded by GEngineVersion. EngineVersion.cpp now defines the constants GEngineVersionChangelist and GCompatibleWithEngineVersionChangelist, which are used to construct GEngineVersion and GCompatibleWithEngineVersion. Modifying those constants allows updating the engine version separately to the defines used for resource files (allowing UGS to update the version number without triggering all files to be relinked).
[CL 2625344 by Ben Marsh in Main branch]
2015-07-18 16:57:53 -04:00
Mark Satterthwaite
153136a986 Re-enable generating .dSYMs on Mac by default for [UEPLAT-308] in development & shipping builds now that the .dSYMs are flat and shouldn't case MAX_PATH errors.
[CL 2609252 by Mark Satterthwaite in Main branch]
2015-07-02 12:16:16 -04:00
Ben Marsh
e3bf999806 Fix parsing of MODULE_API_VERSION on Mac. Now takes ENGINE_IS_LICENSEE_VERSION into account, and handles tabs at the start of the line correctly.
#codereview Michael.Trepka

[CL 2604117 by Ben Marsh in Main branch]
2015-06-29 12:07:55 -04:00
Michael Trepka
2f81f7325a Removed the workaround for the PCH problem that was solved in second Xcode 7 beta
#codereview Josh.Adams

[CL 2597749 by Michael Trepka in Main branch]
2015-06-23 16:02:08 -04:00
Wes Fudala
1ccc1a29b4 Mac build scripts now properly handle renamed launcher.
[CL 2595372 by Wes Fudala in Main branch]
2015-06-22 10:26:14 -04:00
Josh Adams
01c4d45e38 - Renamed Desktop target platform to AllDesktop to reduce conflicts with Desktop directories [UEPLAT-894]
#codereview peter.sauerbrei,ben.marsh

[CL 2588676 by Josh Adams in Main branch]
2015-06-16 11:09:27 -04:00
Josh Adams
9fc4e0dbc8 - Fixed stripping commandline [JIRA UE-17021]
[CL 2587376 by Josh Adams in Main branch]
2015-06-15 11:06:51 -04:00
Josh Adams
7ff0070a83 - Basic support for compiling Xcode 7 (iOS9, MacOS 10.11)
- Marked some overrides properly, then gave up and added -Wno-inconsistent-missing-override)
- Improved Xcode selection process for Mac and iOS (no more hardcoding Xcode path - it uses the currently running Xcode, or xcode-select when using commandline)
   - Added AppleToolchain.cs, to start sharing code between Mac and IOS Toolchains (Compile functionality and params to clang could be shared pretty easily)
   -
- Some Utility functions:
   - Added UBT utility to run a commandline and get its output, self-contained (Utils.RunLocalProcessAndReturnStdOut)
   - Added Log.TraceInformationOnce (and Error, Warning, etc) to print out a message only one time, without a bunch of static bools everywhere
#codereview michael.trepka,peter.sauerbrei,mark.satterthwaite

[CL 2586000 by Josh Adams in Main branch]
2015-06-12 13:45:19 -04:00
Ben Marsh
e0a010415b Treat shadow variable warnings as errors in non-unity builds.
[CL 2582001 by Ben Marsh in Main branch]
2015-06-09 18:14:52 -04:00
Ben Marsh
b4010f44c3 Don't include framework dependencies of static libraries in the app bundle.
[CL 2563322 by Ben Marsh in Main branch]
2015-05-22 16:48:11 -04:00
Ben Marsh
0d5abb5ea4 Fix missing build product when compiling UE4Game on Mac with the -precompile option.
[CL 2562962 by Ben Marsh in Main branch]
2015-05-22 13:55:07 -04:00
Ben Marsh
0664b38ebb Fix linking against static libraries which have circular references back to the original binary. Plugins depend on other engine modules, but linking a monolithic game should not add a library dependency on the monolithic executable.
[CL 2562433 by Ben Marsh in Main branch]
2015-05-22 08:57:34 -04:00
Michael Trepka
a381515afc Fixed custom icon paths on Mac
[CL 2561776 by Michael Trepka in Main branch]
2015-05-21 18:40:21 -04:00
Ben Marsh
16473b93ed Turn shadow variable warnings back into warnings; they are breaking too many builds.
#codereview Marc.Audy

[CL 2561102 by Ben Marsh in Main branch]
2015-05-21 13:59:00 -04:00
Ben.Marsh
b6d21497fc [INTEGRATE] Change 2557067 by Ben.Marsh@ben.marsh_A3068 on 2015/05/19 11:10:14
Fix garbage dylibs being added to build manifest when compiling a single module.

	#codereview Michael.Trepka, Richard.Fawcett

[CL 2557176 by Ben Marsh in Main branch]
2015-05-19 12:00:58 -04:00
Ben Marsh
6b1d263572 Make bEnableShadowVariableWarnings a per-module setting, so we don't break reuse of shared build intermediates.
#codereview Marc.Audy, Wes.Hunt

[CL 2547047 by Ben Marsh in Main branch]
2015-05-12 08:03:21 -04:00
Mark Satterthwaite
5b5808d149 Use a single flat .dSYM on OS X for debug symbols on Josh's advice, this can reside next to the corresponding binary file without breaking the MAX_PATH limit.
#codereview michael.trepka, ben.marsh, josh.adams

[CL 2534903 by Mark Satterthwaite in Main branch]
2015-05-02 12:42:12 -04:00
Ben Marsh
9e6f653803 Strip symbols from iOS and Mac libraries in Rocket builds.
[CL 2527243 by Ben Marsh in Main branch]
2015-04-27 14:20:54 -04:00
Mark Satterthwaite
b3d4de4640 Disabled Mac .dSYM generation as we hit the Windows build machine's MAX_PATH limit for various projects.
#codereview michael.trepka, ben.marsh, zachary.edgertonjones

[CL 2521023 by Mark Satterthwaite in Main branch]
2015-04-22 10:14:12 -04:00
Marc Audy
5eba946116 Allow -Wshadow to be enabled via build configuration
[CL 2520977 by Marc Audy in Main branch]
2015-04-22 09:58:49 -04:00
Mark Satterthwaite
95caf7085e Remove erroneous .dSYM entries for static libraries, only executables & dylibs have corresponding .dSYMs on OS X.
#codereview michael.trepka, ben.marsh

[CL 2519494 by Mark Satterthwaite in Main branch]
2015-04-21 13:00:53 -04:00
Mark Satterthwaite
cbe8a3a615 Remove .dSYM bundle path from BuildReceipt as only files are expected in the list, not folders.
#codereview michael.trepka, ben.marsh

[CL 2519344 by Mark Satterthwaite in Main branch]
2015-04-21 11:38:52 -04:00
Mark Satterthwaite
b8ee025469 Make Mac builds generate .dSYMs by default for Development & Shipping, making sure to add the .dSYM's Info.plist and internal Mach-O binary to the build receipt.
#codereview michael.trepka, ben.marsh

[CL 2519290 by Mark Satterthwaite in Main branch]
2015-04-21 11:04:36 -04:00
Ben Marsh
cb356578a7 Remove unnecessary variables from UEBuildBinaryConfiguration.
[CL 2508328 by Ben Marsh in Main branch]
2015-04-10 10:20:45 -04:00
Michael Trepka
96142bfaaf Alternative way of handling dylibs in Mac bundle subfolders that should work around the Mavericks dlopen() bug
#lockdown Zachary.EdgertonJones

[CL 2502658 by Michael Trepka in Main branch]
2015-04-06 10:41:41 -04:00