4.18 compile fixes

getnamo · Nov 14, 2017 · 24f6c5f · 24f6c5f
1 parent f13ab2e
commit 24f6c5f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/BLUI.uplugin b/BLUI.uplugin
@@ -2,7 +2,7 @@
     "FileVersion": 3,
     "FriendlyName": "BLUI",
     "Version": 3,
-    "VersionName": "3.2.2",
+    "VersionName": "3.2.3",
     "Description": "Chromium Embedded Framework (CEF) powered HTML UI and HUD for Unreal Engine 4",
     "Category": "UI",
     "CreatedBy": "Aaron M. Shea",

diff --git a/Source/Blu/Private/Blu.cpp b/Source/Blu/Private/Blu.cpp
@@ -6,8 +6,8 @@ class FBlu : public IBlu
 	/** IModuleInterface implementation */
 	virtual void StartupModule() override
 	{
-		CefString GameDirCef = *FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "BluCache");
-		FString ExecutablePath = FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "Plugins/BLUI/ThirdParty/cef/");
+		CefString GameDirCef = *FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "BluCache");
+		FString ExecutablePath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "Plugins/BLUI/ThirdParty/cef/");
 
 		// Setup the default settings for BluManager
 		BluManager::settings.windowless_rendering_enabled = true;

diff --git a/Source/Blu/Private/BluBluprintFunctionLibrary.cpp b/Source/Blu/Private/BluBluprintFunctionLibrary.cpp
@@ -60,7 +60,7 @@ FString UBluBlueprintFunctionLibrary::JSONToString(UBluJsonObj *ObjectToParse)
 
 FString UBluBlueprintFunctionLibrary::GameRootDirectory()
 {
-	return FPaths::ConvertRelativePathToFull(FPaths::GameDir());
+	return FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
 }
 
 

diff --git a/Source/Blu/Private/BluEye.cpp b/Source/Blu/Private/BluEye.cpp
@@ -198,7 +198,7 @@ void UBluEye::LoadURL(const FString& newURL)
 	{
 
 		// Get the current working directory
-		FString GameDir = FPaths::ConvertRelativePathToFull(FPaths::GameDir());
+		FString GameDir = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
 
 		// We're loading a local file, so replace the proto with our game directory path
 		FString LocalFile = newURL.Replace(TEXT("blui://"), *GameDir, ESearchCase::IgnoreCase);

diff --git a/Source/BluLoader/Private/BluLoader.cpp b/Source/BluLoader/Private/BluLoader.cpp
@@ -7,7 +7,7 @@ class FBluLoader : public IBluLoader
 	/** IModuleInterface implementation */
 	virtual void StartupModule() override
 	{
-		FString LibPath = FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "Plugins/BLUI/ThirdParty/cef/");
+		FString LibPath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "Plugins/BLUI/ThirdParty/cef/");
 
 		// If we're on Windows we need to load DLLs from our custom path
 		#if PLATFORM_WINDOWS
-Original file line number
+Diff line change
@@ Expand Up @@
     FString UBluBlueprintFunctionLibrary::GameRootDirectory()
     {
-    	return FPaths::ConvertRelativePathToFull(FPaths::GameDir());
+    	return FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
     }
@@ Expand Down @@