Compile fixes for packaged builds

DavidColson · Oct 10, 2020 · 490ee17 · 490ee17
1 parent 6393439
commit 490ee17
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Plugins/UnrealInk/Source/Ink/Ink.Build.cs b/Plugins/UnrealInk/Source/Ink/Ink.Build.cs
@@ -97,13 +97,13 @@ void AddMonoRuntime(ReadOnlyTargetRules Target, string MonoUEPluginDirectory)
         {
             string LibraryName = "mono-2.0-sgen";
             PublicAdditionalLibraries.Add(Path.Combine(MonoLibPath, LibraryName + ".lib"));
-            PublicDelayLoadDLLs.Add(Path.Combine(MonoLibPath, LibraryName + ".dll"));
+            PublicDelayLoadDLLs.Add(LibraryName + ".dll");
         }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
             string LibraryName = "libmonosgen-2.0";
             PublicAdditionalLibraries.Add("iconv");
-            PublicDelayLoadDLLs.Add(Path.Combine(MonoLibPath, LibraryName + ".dylib"));
+            PublicDelayLoadDLLs.Add(LibraryName + ".dylib");
         }
         else
         {

diff --git a/Plugins/UnrealInk/Source/Ink/Private/InkVar.cpp b/Plugins/UnrealInk/Source/Ink/Private/InkVar.cpp
@@ -1,6 +1,8 @@
 #include "InkVar.h"
 
 #include "Misc/AssertionMacros.h"
+#include "Logging/TokenizedMessage.h"
+#include "Logging/MessageLog.h"
 
 #define LOCTEXT_NAMESPACE "UnrealInk"
 

diff --git a/Plugins/UnrealInk/Source/Ink/Private/VariableState.cpp b/Plugins/UnrealInk/Source/Ink/Private/VariableState.cpp
@@ -18,7 +18,7 @@ TArray<FString> UVariablesState::GetVariables()
 
 	// Grab variable names
 	MonoArray* result = MonoInvoke<MonoArray*>("GetVariables", nullptr);
-	for (int i = 0; i < mono_array_length(result); i++)
+	for (uintptr_t i = 0; i < mono_array_length(result); i++)
 	{
 		MonoString* variableName = mono_array_get(result, MonoString*, i);
 		variableNames.Add(FString(mono_string_to_utf8(variableName)));

diff --git a/Plugins/UnrealInk/Source/Ink/Public/InkVar.h b/Plugins/UnrealInk/Source/Ink/Public/InkVar.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Kismet/BlueprintFunctionLibrary.h"
+
 #include "InkVar.generated.h"
 
 // A wrapper for passing around ink vars to and fro ink itself

diff --git a/Plugins/UnrealInk/Source/InkEditor/Private/StoryAssetFactory.cpp b/Plugins/UnrealInk/Source/InkEditor/Private/StoryAssetFactory.cpp
@@ -8,7 +8,7 @@
 #include "InkEditor.h"
 #include "InkCompiler.h"
 #include "Misc/FileHelper.h"
-#include "Misc\FeedbackContext.h"
+#include "Misc/FeedbackContext.h"
 #include "EditorFramework/AssetImportData.h"
 
 void FAssetTypeActions_StoryAsset::GetResolvedSourceFilePaths(const TArray<UObject*>& TypeAssets, TArray<FString>& OutSourceFilePaths) const