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 //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

Browse Source 
#rb none

[CL 4227549 by Ryan Gerleve in Dev-Networking branch]
This commit is contained in:
Ryan Gerleve
2018-07-23 14:41:30 -04:00
parent 93441abe0d
commit 58b2ff476e
483 changed files with 14403 additions and 7737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp
View File

@@ -35,7 +35,11 @@
#pragma warning(disable: 6244)
// import EnvDTE
#import "libid:80cc9f66-e7d8-4ddd-85b6-d9e6cd0e93e2" version("8.0") lcid("0") raw_interfaces_only named_guids
#if VSACCESSOR_HAS_DTE_OLB
#import "NotForLicensees/dte80a.olb" version("8.0") lcid("0") raw_interfaces_only named_guids
#else
#import "libid:80cc9f66-e7d8-4ddd-85b6-d9e6cd0e93e2" version("8.0") lcid("0") raw_interfaces_only named_guids
#endif
#pragma warning(pop)
#endif

43
Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/VisualStudioSourceCodeAccess.Build.cs
View File

@@ -1,5 +1,6 @@
// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
using Microsoft.Win32;
using System.IO;
namespace UnrealBuildTool.Rules
{
@@ -23,24 +24,36 @@ namespace UnrealBuildTool.Rules
}
bool bHasVisualStudioDTE;
try
// In order to support building the plugin on build machines (which may not have the IDE installed), allow using an OLB rather than registered component.
string DteOlbPath = Path.Combine(ModuleDirectory, "Private", "NotForLicensees", "dte80a.olb");
if(File.Exists(DteOlbPath))
{
// Interrogate the Win32 registry
string DTEKey = null;
switch (Target.WindowsPlatform.Compiler)
{
case WindowsCompiler.VisualStudio2017:
DTEKey = "VisualStudio.DTE.15.0";
break;
case WindowsCompiler.VisualStudio2015:
DTEKey = "VisualStudio.DTE.14.0";
break;
}
bHasVisualStudioDTE = RegistryKey.OpenBaseKey(RegistryHive.ClassesRoot, RegistryView.Registry32).OpenSubKey(DTEKey) != null;
PrivateDefinitions.Add("VSACCESSOR_HAS_DTE_OLB=1");
bHasVisualStudioDTE = true;
}
catch
else
{
bHasVisualStudioDTE = false;
PrivateDefinitions.Add("VSACCESSOR_HAS_DTE_OLB=0");
try
{
// Interrogate the Win32 registry
string DTEKey = null;
switch (Target.WindowsPlatform.Compiler)
{
case WindowsCompiler.VisualStudio2017:
DTEKey = "VisualStudio.DTE.15.0";
break;
case WindowsCompiler.VisualStudio2015:
DTEKey = "VisualStudio.DTE.14.0";
break;
}
bHasVisualStudioDTE = RegistryKey.OpenBaseKey(RegistryHive.ClassesRoot, RegistryView.Registry32).OpenSubKey(DTEKey) != null;
}
catch
{
bHasVisualStudioDTE = false;
}
}
if (bHasVisualStudioDTE)