UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
This commit is contained in:
Mario Zechner 2020-03-30 16:22:39 +02:00
commit 2465cef151
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineEditorPlugin.h
View File

@ -29,7 +29,7 @@
#pragma once #pragma once
#include "ModuleManager.h" #include "Modules/ModuleManager.h"
class ISpineEditorPlugin : public IModuleInterface { class ISpineEditorPlugin : public IModuleInterface {

4
spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs
View File

@ -8,6 +8,10 @@ namespace UnrealBuildTool.Rules
public SpineEditorPlugin(ReadOnlyTargetRules Target) : base(Target) public SpineEditorPlugin(ReadOnlyTargetRules Target) : base(Target)
{ {
PrivatePCHHeaderFile = "Private/SpineEditorPluginPrivatePCH.h"; PrivatePCHHeaderFile = "Private/SpineEditorPluginPrivatePCH.h";
PCHUsage = PCHUsageMode.UseSharedPCHs;
#if UE_4_24_OR_LATER
DefaultBuildSettings = BuildSettingsVersion.V1;
#endif
PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public"));
PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "../SpinePlugin/Public/spine-cpp/include")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "../SpinePlugin/Public/spine-cpp/include"));

2
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpinePlugin.h
View File

@ -29,7 +29,7 @@
#pragma once #pragma once
#include "ModuleManager.h" #include "Modules/ModuleManager.h"
DECLARE_LOG_CATEGORY_EXTERN(SpineLog, Log, All); DECLARE_LOG_CATEGORY_EXTERN(SpineLog, Log, All);

6
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs
View File

@ -8,8 +8,12 @@ namespace UnrealBuildTool.Rules
public SpinePlugin(ReadOnlyTargetRules Target) : base(Target) public SpinePlugin(ReadOnlyTargetRules Target) : base(Target)
{ {
PrivatePCHHeaderFile = "Private/SpinePluginPrivatePCH.h"; PrivatePCHHeaderFile = "Private/SpinePluginPrivatePCH.h";
PCHUsage = PCHUsageMode.UseSharedPCHs;
#if UE_4_24_OR_LATER
DefaultBuildSettings = BuildSettingsVersion.V1;
#endif
PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public"));
PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/spine-cpp/include")); PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/spine-cpp/include"));
PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private")); PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private"));

2
spine-ue4/SpineUE4.uproject
View File

@ -1,6 +1,6 @@
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "4.23", "EngineAssociation": "4.24",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [