Merge pull request #38 from MarkusRannare/feature_fix_warnings

Fix warnings
modio · Oct 16, 2020 · 6c8f7a7 · 6c8f7a7
2 parents fccee4c + 62be06f
commit 6c8f7a7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/Source/modio/modio.Build.cs b/Source/modio/modio.Build.cs
@@ -34,6 +34,10 @@ public modio(ReadOnlyTargetRules Target) : base(Target)
 
 		PrivateDependencyModuleNames.AddRange(new string[] { });
 
+#if UE_4_24_OR_LATER
+		DefaultBuildSettings = BuildSettingsVersion.V2;
+#endif
+
 		LoadModio(Target);
 
 		// @todo: Can we disable exceptions again?
@@ -102,9 +106,9 @@ public bool LoadModio(ReadOnlyTargetRules Target)
 			isLibrarySupported = true;
 
 			string LibrariesPath = Path.Combine(ThirdPartyPath, modio_directory, "lib", "msvc", "x64");
-			string DLLPath = Path.Combine(ThirdPartyPath, modio_directory, "bin", "win64");
-
-			PublicAdditionalLibraries.Add(LibrariesPath + "/modio.lib");
+			string DLLPath = Path.Combine(ThirdPartyPath, modio_directory, "bin", "msvc", "x64");
+			
+			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "modio.lib"));
 			RuntimeDependencies.Add(Path.Combine(DLLPath, "modio.dll"));
 
 			string ProjectBinariesDirectory = Path.Combine(ProjectPath, "Binaries", "Win64");
@@ -153,10 +157,8 @@ public bool LoadModio(ReadOnlyTargetRules Target)
 
 		if (isLibrarySupported)
 		{
-			string ModioIncludePath = Path.Combine(ThirdPartyPath, modio_directory, "include");
-			string AdditionalDependenciesPath = Path.Combine(ThirdPartyPath, modio_directory, "additional_dependencies");
-			PublicIncludePaths.Add(ModioIncludePath);
-			PublicIncludePaths.Add(AdditionalDependenciesPath);
+			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, modio_directory, "include"));
+			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, modio_directory, "additional_dependencies"));
 		}
 
 		return isLibrarySupported;

diff --git a/Source/modioEditor/Private/modioEditor.cpp b/Source/modioEditor/Private/modioEditor.cpp
@@ -30,6 +30,8 @@ void FmodioEditorModule::StartupModule()
 
 	FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked<FLevelEditorModule>("LevelEditor");
 
+	// Remove the dropdown for now, as it's not used and just comfuses people
+	if(0)
 	{
 		TSharedPtr<FExtender> ToolbarExtender = MakeShareable(new FExtender);
 		ToolbarExtender->AddToolBarExtension("Content", EExtensionHook::After, PluginCommands, FToolBarExtensionDelegate::CreateRaw(this, &FmodioEditorModule::AddToolbarExtension));

diff --git a/Source/modioEditor/Private/modioEditorCommands.cpp b/Source/modioEditor/Private/modioEditorCommands.cpp
@@ -7,11 +7,11 @@
 
 void FmodioEditorCommands::RegisterCommands()
 {
-	UI_COMMAND(Login, "Login", "Login to modio (not implemented)", EUserInterfaceActionType::Button, FInputGesture());
+  /*UI_COMMAND(Login, "Login", "Login to modio (not implemented)", EUserInterfaceActionType::Button, FInputGesture());
   UI_COMMAND(Logout, "Logout", "Logout from modio (not implemented)", EUserInterfaceActionType::Button, FInputGesture() );
   UI_COMMAND(UploadMod, "Upload Mod", "Upload mod to modio (not implemented)", EUserInterfaceActionType::Button, FInputGesture() );
   UI_COMMAND(NewModWizard, "New mod wizard", "r u a wizzard? (not implemented)", EUserInterfaceActionType::Button, FInputGesture() );
-  UI_COMMAND(Settings, "Settings", "Configure modio environment (not implemented)", EUserInterfaceActionType::Button, FInputGesture() );
+  UI_COMMAND(Settings, "Settings", "Configure modio environment (not implemented)", EUserInterfaceActionType::Button, FInputGesture() );*/
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Source/modioEditor/modioEditor.Build.cs b/Source/modioEditor/modioEditor.Build.cs
@@ -8,7 +8,11 @@ public class modioEditor : ModuleRules
 	public modioEditor(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-
+
+#if UE_4_24_OR_LATER
+		DefaultBuildSettings = BuildSettingsVersion.V2;
+#endif
+
 		PublicIncludePaths.AddRange(
 			new string[] {
 				// ... add public include paths required here ...

diff --git a/build/MakeRelease/Options.cs b/build/MakeRelease/Options.cs
@@ -8,6 +8,7 @@ namespace MakeRelease
 	/** Handles the arguments passed into main */
 	public class Options
 	{
+		// @todo: Add a new option switch that logs the output to a file too, so that we can look at the logs afterwards
 		[Option('v', "version", Required = true, HelpText = "The version of the UE4 plugin we want to submit")]
 		public string UE4PluginVersion { get; set; }
 	}