Commit Graph

584 Commits

Author SHA1 Message Date
Robert Manuszewski
e3d090926d Making BuildConfiguration.bForceUnityBuild take precedence over bFasterWithoutUnity
[CL 2348165 by Robert Manuszewski in Main branch]
2014-11-04 05:27:19 -05:00
Dmitry Rekman
d9110cdd37 Fix CIS (UBT non-mono project).
[CL 2347919 by Dmitry Rekman in Main branch]
2014-11-04 00:37:20 -05:00
Dmitry Rekman
9e04402720 UBT: Changes to project generators.
- Separates CMake generator from makefile one and adds qmake generator.
- Contributed by salamanderrake (PR #560).

#codereview Josh.Adams, Robert.Manuszewski

[CL 2347904 by Dmitry Rekman in Main branch]
2014-11-04 00:22:19 -05:00
Ryan Gerleve
9f473067fd Fixes for building the TapJoy plugin when it's enabled
#codereview john.pollard

[CL 2347356 by Ryan Gerleve in Main branch]
2014-11-03 15:48:07 -05:00
Peter Sauerbrei
672d502a24 fix for duplicate scheme names when building IOS
UE-4506
#ios

[CL 2347354 by Peter Sauerbrei in Main branch]
2014-11-03 15:47:55 -05:00
Chris Babcock
36b85021b3 Fix for attempting to delete nonexistant directory during packaging for Android
#android
#ue4
#codeview Josh.Adams

[CL 2347149 by Chris Babcock in Main branch]
2014-11-03 11:25:56 -05:00
Ben Marsh
f1a24ce8dd Don't use exceptions to check whether HTML5 is not installed - it prevents running through Visual Studio with break-on-exceptions turned on.
#codereview Ankit.Khare

[CL 2347066 by Ben Marsh in Main branch]
2014-11-03 10:50:47 -05:00
Jaroslaw Palczynski
55a53079aa Unable to perform hot-reload due to compilation errors. Fixed.
Additionally fixed some monolithic compilation errors on CIS.

UE-4845

#codereview Robert.Manuszewski
#lockdown James.Dickinson

[CL 2346112 by Jaroslaw Palczynski in Main branch]
2014-10-31 10:27:46 -04:00
Jaroslaw Palczynski
3bacd1bbc5 Fix for AutoStartupModuleList, so it always builds UE4Game shared library in non-monolithic builds which is now required.
[CL 2345988 by Jaroslaw Palczynski in Main branch]
2014-10-31 05:16:43 -04:00
Joe Tidmarsh
82438e4c0b dSYM fixup for IOS deployment from XCode
[CL 2345972 by Joe Tidmarsh in Main branch]
2014-10-31 04:46:23 -04:00
Ankit Khare
55d2e28ba4 Allow html sdk path to be set using ini file.
- takes preference over EMSCRIPTEN env variable
   - editor can now detect sdk on yosemite.
   - refactor and simplyfy emscripten sdk access in .cs files.

#corereview james.moran

[CL 2345958 by Ankit Khare in Main branch]
2014-10-31 04:31:19 -04:00
Dmitry Rekman
0dc3ccd3e0 Linux: support compiling for other architectures than x86_64.
[CL 2345608 by Dmitry Rekman in Main branch]
2014-10-30 19:44:12 -04:00
Chris Babcock
32c172f9ed Fix for ShouldWriteJavaBuildSettingsFile substring length overrun (and protect against corrupt file)
#android
#ue4
#codereview Josh.Adams

[CL 2345510 by Chris Babcock in Main branch]
2014-10-30 17:28:35 -04:00
Robert Manuszewski
e3203338d5 TSubobjectPtr removal, phase II. Making sure we're not breaking licensee projects by making subobjects TEMPORARILY public and deprecated (but only for game modules).
#change Made subobjects public again
#change Added temporary privat_subobject macro (defaults to public keyword) to help with changing eveything back later
#change TEMPORARILY moved subobject accessors to cpp fiels so that we don't get deprecation warnings when compiling the engine headers
#change Added DEPRECATED_FORGAME macro which is empty for the engine modules and reverts back to DEPRECATED for game modules

[CL 2345437 by Robert Manuszewski in Main branch]
2014-10-30 17:10:56 -04:00
Peter Sauerbrei
5c44aa08f3 addition of arm64 and armv7s architecture to the IOS project settings
UEPLAT-24
#ios

[CL 2345434 by Peter Sauerbrei in Main branch]
2014-10-30 17:10:29 -04:00
Michael Trepka
715ac08f35 Initial Mac-specific project settings (splash screen and icon for now), including minimal implementation of ImageWrapper for .icns files
[CL 2345090 by Michael Trepka in Main branch]
2014-10-30 12:36:31 -04:00
Josh Adams
b3d5cf5e5c - Big cleanup of Android packaging optimization, made it more safe (adds a few seconds)
- Made java library handling programmatic, no more hardcoding googleplayservices (just put your lib in <Project>\\Build\\Android\\JavaLibs like we have google now in Engine\\Build\\Android\\Java\\JavaLibs)
#codereview chris.babcock,ryan.gerleve

[CL 2345079 by Josh Adams in Main branch]
2014-10-30 12:30:32 -04:00
Jaroslaw Palczynski
2df4ab4b49 [UE-4798] AutostartupModules is not working properly
The auto-startup module list is now compiled to:
1. Exe if the target is a program.
2. Game module binary if the target is game, editor etc.

#codereview Robert.Manuszewski

[CL 2344885 by Jaroslaw Palczynski in Main branch]
2014-10-30 10:07:51 -04:00
Josh Adams
3cd1cc4efa - Fixing xbox packaging issues [UE-1251]
#codereview jeff.campeau
#lockdown james.dickinson

[CL 2344061 by Josh Adams in Main branch]
2014-10-29 14:43:27 -04:00
Michael Trepka
65bcecb534 Fix for Mac monolithic builds
#lockdown Andy.Bayle

[CL 2343815 by Michael Trepka in Main branch]
2014-10-29 10:37:36 -04:00
Dmitry Rekman
45ed24286b Fix linking to libraries located in path with spaces.
- PR #551 contributed by amigo.
- Fixes a quite common case of a project with plugins being located in "Unreal Projects" directory.
- UE-4651

[CL 2343090 by Dmitry Rekman in Main branch]
2014-10-28 20:44:29 -04:00
Dmitry Rekman
ae0d7ea2e5 Fix mono warning (unused variable).
[CL 2343081 by Dmitry Rekman in Main branch]
2014-10-28 20:29:28 -04:00
Michael Trepka
471e289d46 Workaround for a problem with Mac build products being placed in wrong subfolder of an app bundle due to duplicate entries in Binaries array in MacToolChain.FixBundleBinariesPaths()
[CL 2342771 by Michael Trepka in Main branch]
2014-10-28 16:23:42 -04:00
Marcus Wassmer
bcd5b9c326 Add GenerateChunks (-manifests) support to Packaging Settings. Read it properly from .ini when setting up ProjectParams.
#codereview josh.adams,peter.sauerbrei

[CL 2341633 by Marcus Wassmer in Main branch]
2014-10-27 17:53:23 -04:00
Ben Marsh
55c5cadc04 Fix cached include paths being modified by CompileCPPFiles() for Mac and iOS.
#codereview Josh.Adams, Michael.Trepka

[CL 2341234 by Ben Marsh in Main branch]
2014-10-27 13:09:47 -04:00