From 5ce659145fa5a55405b0093f279ee41cfb9f390d Mon Sep 17 00:00:00 2001
From: brong <brong@nvidia.com>
Date: Tue, 21 Aug 2018 17:33:31 +0800
Subject: Upgrade to Unreal Engine 4.20.1

---
 NVIDIAGfeSDK.uplugin                               | 37 ++++++++++++----------
 README.md                                          |  2 +-
 Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs          |  3 --
 Source/NVIDIAGfeSDK/Private/FNVIDIAGfeSDK.cpp      |  2 +-
 Source/NVIDIAGfeSDK/Private/GfeSDKHighlights.cpp   |  1 -
 Source/NVIDIAGfeSDK/Private/HighLightBlueprint.cpp |  1 -
 .../NVIDIAGfeSDK/Private/NVIDIAGfeSDKPrivatePCH.h  |  1 -
 Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKPublicPCH.h |  3 --
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/NVIDIAGfeSDK.uplugin b/NVIDIAGfeSDK.uplugin
index c6d54c5..ce9074f 100644
--- a/NVIDIAGfeSDK.uplugin
+++ b/NVIDIAGfeSDK.uplugin
@@ -1,25 +1,30 @@
 {
-	"FileVersion": 3,
-	"FriendlyName": "NVIDIA Shadowplay Highlights SDK Plugin",
-	"Version": 1,
-	"VersionName": "1.0",
-	"CreatedBy": "NVIDIA",
-	"CreatedByURL": "https://developer.nvidia.com/shadowplay-highlights",
-	"DocsURL": "",
-	"Description": "NVIDIA GeForce SDK with Shadowplay Highlights",
-	"Category": "Other",
-	"EnabledByDefault": false,
-	"Modules": [
+	"FileVersion" : 3,
+	"Version" : 1,
+	"VersionName" : "1.0",
+	"FriendlyName" : "NVIDIA Shadowplay Highlights SDK Plugin",
+	"Description" : "NVIDIA GeForce SDK with Shadowplay Highlights",
+	"Category" : "Other",
+	"CreatedBy" : "NVIDIA",
+	"CreatedByURL" : "https://developer.nvidia.com/shadowplay-highlights",
+	"DocsURL" : "",
+	"MarketplaceURL" : "",
+	"SupportURL" : "",
+	"EnabledByDefault" : false,
+	"CanContainContent" : false,
+	"IsBetaVersion" : false,
+	"Installed" : false,
+	"Modules" :
+	[
 		{
-			"Name": "NVIDIAGfeSDK",
-			"Type": "Runtime",
-			"LoadingPhase": "PostConfigInit",
+			"Name" : "NVIDIAGfeSDK",
+			"Type" : "Runtime",
+			"LoadingPhase" : "PostConfigInit",
 			"WhitelistPlatforms" :
  			[
 				"Win64",
 				"Win32"
 			]
 		}
-	],
-	"CanContainContent": false
+	]
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 7a96234..0662cf7 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The plugin implements the GFE Shadowplay Highlights functionality for blueprints
 
 1. Navigate to Engine\Plugins\Runtime\Nvidia
 
-2. Execute: git submodule add -b 4.18 https://github.com/NVIDIAGameWorks/GfeSDK-UE4Plugin.git GfeSDK
+2. Execute: git submodule add -b 4.20 https://github.com/NVIDIAGameWorks/GfeSDK-UE4Plugin.git GfeSDK
 
 
 See the documentation [here](./Documentation/Manual.html)
\ No newline at end of file
diff --git a/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs b/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs
index c02d984..b1fadbf 100644
--- a/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs
+++ b/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs
@@ -30,7 +30,6 @@ namespace UnrealBuildTool.Rules
         {
             PublicIncludePaths.AddRange(
                 new string[] {
-                "NVIDIAGfeSDK/Public",
                 ThirdPartyPath + "NVIDIAGfeSDK/Include",
                 ThirdPartyPath + "NVIDIAGfeSDK/Include/gfesdk",
                     // ... add public include paths required here ...
@@ -39,8 +38,6 @@ namespace UnrealBuildTool.Rules
 
             PrivateIncludePaths.AddRange(
                 new string[] {
-                "NVIDIAGfeSDK/Private",
-                    //Path.Combine(ThirdPartyPath, "NVIDIAGfeSDK", "Include"),
                 ThirdPartyPath + "NVIDIAGfeSDK/Include",
                 ThirdPartyPath + "NVIDIAGfeSDK/Include/gfesdk",
                     // ... add other private include paths required here ...
diff --git a/Source/NVIDIAGfeSDK/Private/FNVIDIAGfeSDK.cpp b/Source/NVIDIAGfeSDK/Private/FNVIDIAGfeSDK.cpp
index ca129ce..eba0aab 100644
--- a/Source/NVIDIAGfeSDK/Private/FNVIDIAGfeSDK.cpp
+++ b/Source/NVIDIAGfeSDK/Private/FNVIDIAGfeSDK.cpp
@@ -10,7 +10,7 @@
 #include "NVIDIAGfeSDKPrivatePCH.h"
 #include "Runtime/Core/Public/Misc/Paths.h"
 #include "Runtime/Core/Public/Windows/WindowsPlatformProcess.h"
-#include "IPluginManager.h"
+#include "Interfaces/IPluginManager.h"
 #include "gfesdk/sdk_types.h"
 
 
diff --git a/Source/NVIDIAGfeSDK/Private/GfeSDKHighlights.cpp b/Source/NVIDIAGfeSDK/Private/GfeSDKHighlights.cpp
index f5e6277..b008b6e 100644
--- a/Source/NVIDIAGfeSDK/Private/GfeSDKHighlights.cpp
+++ b/Source/NVIDIAGfeSDK/Private/GfeSDKHighlights.cpp
@@ -8,7 +8,6 @@
 */
 #include "GfeSDKHighlights.h"
 #include "NVIDIAGfeSDKPrivatePCH.h"
-#include "Platform.h"
 
 #define VALIDATE_MODULE_HIGHLIGHTS()                                           \
     if (!GFEHandle && Callback)                                    \
diff --git a/Source/NVIDIAGfeSDK/Private/HighLightBlueprint.cpp b/Source/NVIDIAGfeSDK/Private/HighLightBlueprint.cpp
index c6de5a7..f48b3d3 100644
--- a/Source/NVIDIAGfeSDK/Private/HighLightBlueprint.cpp
+++ b/Source/NVIDIAGfeSDK/Private/HighLightBlueprint.cpp
@@ -6,7 +6,6 @@
 #include "NVIDIAGfeSDKTypes.h"
 #include "CoreMinimal.h"
 #include "Runtime/CoreUObject/Public/UObject/Package.h"
-#include "Platform.h"
 
 #include <gfesdk/bindings/cpp/sdk_types_cpp.h>
 #include <sdk_types_ipc.h>
diff --git a/Source/NVIDIAGfeSDK/Private/NVIDIAGfeSDKPrivatePCH.h b/Source/NVIDIAGfeSDK/Private/NVIDIAGfeSDKPrivatePCH.h
index 7c5bfa8..856f857 100644
--- a/Source/NVIDIAGfeSDK/Private/NVIDIAGfeSDKPrivatePCH.h
+++ b/Source/NVIDIAGfeSDK/Private/NVIDIAGfeSDKPrivatePCH.h
@@ -8,7 +8,6 @@
  */
 
 #include "NVIDIAGfeSDKPublicPCH.h"
-#include "ModuleManager.h"
 #include "FNVIDIAGfeSDK.h"
 #include "TypeTranslation.h"
 #include <gfesdk/bindings/cpp/isdk_cpp_impl.h>
diff --git a/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKPublicPCH.h b/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKPublicPCH.h
index 8b446f7..9e31fcb 100644
--- a/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKPublicPCH.h
+++ b/Source/NVIDIAGfeSDK/Public/NVIDIAGfeSDKPublicPCH.h
@@ -1,7 +1,4 @@
-#include "ModuleManager.h"
 #include "CoreMinimal.h"
-//#include "Engine.h"
-#include "UniquePtr.h"
 
 #include "NVIDIAGfeSDKTypes.h"
 #include "GfeSDKCore.h"
-- 
cgit v1.2.3