izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Copying //UE4/Partner-Oculus-Staging to Dev-VR (//UE4/Dev-VR)

Browse Source 
Copying up 1.25
#rb none

[CL 4114562 by Ryan Vance in Dev-VR branch]
This commit is contained in:
Ryan Vance
2018-06-05 18:45:32 -04:00
parent abc15e5115
commit 5607dde0ad
70 changed files with 1779 additions and 5333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidProjectGenerator.cs
View File

@@ -472,6 +472,10 @@ namespace UnrealBuildTool
" <Configuration>Debug</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Development|ARM\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Development</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Release|ARM\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Release</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM</Platform> " + ProjectFileGenerator.NewLine +
@@ -480,6 +484,10 @@ namespace UnrealBuildTool
" <Configuration>Debug</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM64</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Development|ARM64\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Development</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM64</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Release|ARM64\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Release</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>ARM64</Platform> " + ProjectFileGenerator.NewLine +
@@ -488,6 +496,10 @@ namespace UnrealBuildTool
" <Configuration>Debug</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x64</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Development|x64\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Development</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x64</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Release|x64\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Release</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x64</Platform> " + ProjectFileGenerator.NewLine +
@@ -496,6 +508,10 @@ namespace UnrealBuildTool
" <Configuration>Debug</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x86</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Development|x86\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Development</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x86</Platform> " + ProjectFileGenerator.NewLine +
" </ProjectConfiguration> " + ProjectFileGenerator.NewLine +
" <ProjectConfiguration Include=\"Release|x86\"> " + ProjectFileGenerator.NewLine +
" <Configuration>Release</Configuration> " + ProjectFileGenerator.NewLine +
" <Platform>x86</Platform> " + ProjectFileGenerator.NewLine +
@@ -504,7 +520,7 @@ namespace UnrealBuildTool
" <PropertyGroup Label=\"Globals\"> " + ProjectFileGenerator.NewLine +
" <RootNamespace>" + ProjectName + "</RootNamespace> " + ProjectFileGenerator.NewLine +
" <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> " + ProjectFileGenerator.NewLine +
" <ProjectVersion>1.0</ProjectVersion> " + ProjectFileGenerator.NewLine +
" <ProjectVersion>1.0</ProjectVersion> " + ProjectFileGenerator.NewLine +
//Set the project guid
" <ProjectGuid>" + System.Guid.NewGuid().ToString("B").ToUpper() + "</ProjectGuid> " + ProjectFileGenerator.NewLine +
@@ -519,6 +535,10 @@ namespace UnrealBuildTool
" <UseDebugLibraries>true</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
@@ -527,6 +547,10 @@ namespace UnrealBuildTool
" <UseDebugLibraries>true</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM64\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
@@ -535,6 +559,10 @@ namespace UnrealBuildTool
" <UseDebugLibraries>true</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x64\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x64\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
@@ -543,6 +571,10 @@ namespace UnrealBuildTool
" <UseDebugLibraries>true</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x86\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x86\'\" Label=\"Configuration\"> " + ProjectFileGenerator.NewLine +
" <UseDebugLibraries>false</UseDebugLibraries> " + ProjectFileGenerator.NewLine +
" <TargetName>$(RootNamespace)</TargetName> " + ProjectFileGenerator.NewLine +
@@ -552,18 +584,26 @@ namespace UnrealBuildTool
" <PropertyGroup Label=\"UserMacros\" /> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Debug|ARM\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Debug|x64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x64\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Debug|x86\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x86\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <PropertyGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x86\'\"> " + ProjectFileGenerator.NewLine +
" </PropertyGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Debug|ARM\'\"> " + ProjectFileGenerator.NewLine +
@@ -571,6 +611,11 @@ namespace UnrealBuildTool
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
@@ -581,6 +626,11 @@ namespace UnrealBuildTool
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|ARM64\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
@@ -591,6 +641,11 @@ namespace UnrealBuildTool
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x64\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x64\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
@@ -601,13 +656,18 @@ namespace UnrealBuildTool
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Development|x86\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <ItemDefinitionGroup Condition=\"\'$(Configuration)|$(Platform)\'==\'Release|x86\'\"> " + ProjectFileGenerator.NewLine +
" <AntPackage> " + ProjectFileGenerator.NewLine +
" <AndroidAppLibName /> " + ProjectFileGenerator.NewLine +
" </AntPackage> " + ProjectFileGenerator.NewLine +
" </ItemDefinitionGroup> " + ProjectFileGenerator.NewLine +
" <Import Project=\"$(AndroidTargetsPath)\\Android.targets\" /> " + ProjectFileGenerator.NewLine +
" <ImportGroup Label=\"ExtensionTargets\" /> " + ProjectFileGenerator.NewLine +
" <ImportGroup Label=\"ExtensionTargets\" /> " + ProjectFileGenerator.NewLine +
"</Project>";
bool Success = ProjectFileGenerator.WriteFileIfChanged(ProjectFileGenerator.IntermediateProjectFilesPath + "\\" + FileName, FileText);