Commit Graph

6 Commits

Author SHA1 Message Date
Josh Adams
0d9c94a6ac - Handle argv vs UE4CommandLine.txt conflicts by skipping over multiple .uproject tokens [UE-14121]
- Cleaned up some some dirty code [UE-14120]
#codereview ben.marsh

[CL 2521298 by Josh Adams in Main branch]
2015-04-22 13:05:07 -04:00
Josh Adams
1c3152bd41 Rollback //depot/UE4/Engine/Source/Programs/AutomationTool/Desktop/Desktop.Automation.csproj to revision 2
[CL 2506780 by Josh Adams in Main branch]
2015-04-09 10:24:54 -04:00
Josh Adams
4c85561d84 - Added the automation scripts to the AutomationTool_Mono solution
- Fixed the Desktop.Automation.csproj GUID to not overlap Android

[CL 2505888 by Josh Adams in Main branch]
2015-04-08 17:04:17 -04:00
Josh Adams
86f2e08a55 - Added support for DesktopPlatform to package content and executables together (editor's File | Package)
- This is a first pass
  - Mac uses data outside the .app so that there's only one copy of the content. This should get a bootstrap executable like Windows has
  - Only tested on Mac so far, although it doesn't handle D3D11 shaders, or some of the icon updating for the bootstrap working
- Added Desktop platform icons

[CL 2505866 by Josh Adams in Main branch]
2015-04-08 16:59:20 -04:00
Ben Marsh
6fb1433bf2 Assign unique guid in Desktop.Automation.csproj; looks like it was copied from Android.Automation.csproj. Prevents prompt to save every time, and it being dumped at the bottom of the solution.
#codereview Josh.Adams

[CL 2450074 by Ben Marsh in Main branch]
2015-02-18 09:39:52 -05:00
Josh Adams
56440f0048 - First checkin for the new DesktopTargetPlatform that will be able to cook packages for Windows, Mac, and Linux. So far, cooking on Windows and Mac and run on each other (with -opengl on Windows, since Mac can't currently compile D3D shaders)
[CL 2448658 by Josh Adams in Main branch]
2015-02-17 09:57:44 -05:00