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

- Merging Dev-Kairos/Engine/... to Main/Engine/...

Browse Source 
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
This commit is contained in:
josh adams
2019-02-28 17:06:02 -05:00
parent ca5500780b
commit 019c12863e
385 changed files with 40324 additions and 2907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioCode/VSCodeProjectFileGenerator.cs
View File

@@ -1198,6 +1198,10 @@ namespace UnrealBuildTool
{
DirectoryReference ProjDir = Target.TargetFilePath.Directory.GetDirectoryName() == "Source" ? Target.TargetFilePath.Directory.ParentDirectory : Target.TargetFilePath.Directory;
GetExcludePathsCPP(ProjDir, PathsToExclude);
DirectoryReference PluginRootDir = DirectoryReference.Combine(ProjDir, "Plugins");
WriteWorkspaceSettingsFileForPlugins(PluginRootDir, PathsToExclude);
bFoundTarget = true;
}
}
@@ -1225,6 +1229,26 @@ namespace UnrealBuildTool
OutFile.Write(FileReference.Combine(VSCodeDir, "settings.json"));
}
private void WriteWorkspaceSettingsFileForPlugins(DirectoryReference PluginBaseDir, List<string> PathsToExclude)
{
if (DirectoryReference.Exists(PluginBaseDir))
{
foreach (DirectoryReference SubDir in DirectoryReference.EnumerateDirectories(PluginBaseDir, "*", SearchOption.TopDirectoryOnly))
{
string[] UPluginFiles = Directory.GetFiles(SubDir.ToString(), "*.uplugin");
if (UPluginFiles.Length == 1)
{
DirectoryReference PluginDir = SubDir;
GetExcludePathsCPP(PluginDir, PathsToExclude);
}
else
{
WriteWorkspaceSettingsFileForPlugins(SubDir, PathsToExclude);
}
}
}
}
private void WriteWorkspaceFile(ProjectData ProjectData)
{
JsonFile WorkspaceFile = new JsonFile();