From 7089947ecce395394dbfa6dc829821e639a7976e Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 30 Mar 2020 15:55:13 +0200 Subject: [PATCH] [ue4] Updated example project to UE 4.24.3. Fixed up plugin module headers and build.cs files to conform to the new UBT rules. We use the V1 default settings for now, to keep compatibility with older UE4 versions. --- .../Source/SpineEditorPlugin/Public/SpineEditorPlugin.h | 2 +- .../Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs | 2 ++ .../SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h | 2 +- .../SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs | 4 +++- spine-ue4/SpineUE4.uproject | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineEditorPlugin.h b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineEditorPlugin.h index 07c0efdc5..094e5cd98 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineEditorPlugin.h +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineEditorPlugin.h @@ -29,7 +29,7 @@ #pragma once -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" class ISpineEditorPlugin : public IModuleInterface { diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs index 523fec5ad..ee30d44e3 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs @@ -8,6 +8,8 @@ namespace UnrealBuildTool.Rules public SpineEditorPlugin(ReadOnlyTargetRules Target) : base(Target) { PrivatePCHHeaderFile = "Private/SpineEditorPluginPrivatePCH.h"; + PCHUsage = PCHUsageMode.UseSharedPCHs; + DefaultBuildSettings = BuildSettingsVersion.V1; PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "../SpinePlugin/Public/spine-cpp/include")); diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h index ffb08b0b1..9c9225269 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h @@ -29,7 +29,7 @@ #pragma once -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" DECLARE_LOG_CATEGORY_EXTERN(SpineLog, Log, All); diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs index d2037221d..85faac467 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs @@ -8,8 +8,10 @@ namespace UnrealBuildTool.Rules public SpinePlugin(ReadOnlyTargetRules Target) : base(Target) { PrivatePCHHeaderFile = "Private/SpinePluginPrivatePCH.h"; + PCHUsage = PCHUsageMode.UseSharedPCHs; + DefaultBuildSettings = BuildSettingsVersion.V1; - PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public")); + PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/spine-cpp/include")); PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private")); diff --git a/spine-ue4/SpineUE4.uproject b/spine-ue4/SpineUE4.uproject index 1fd20a5a7..51b0b4850 100644 --- a/spine-ue4/SpineUE4.uproject +++ b/spine-ue4/SpineUE4.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "4.23", + "EngineAssociation": "4.24", "Category": "", "Description": "", "Modules": [