UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.6-beta

Browse Source 
Conflicts:
	spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
	spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
	spine-unity/Assets/spine-unity/SkeletonAnimator.cs
This commit is contained in:
pharan 2017-06-14 19:46:14 +08:00
commit 265d9413d3
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ namespace UnrealBuildTool.Rules
{ {
public class SpineEditorPlugin : ModuleRules public class SpineEditorPlugin : ModuleRules
{ {
public SpineEditorPlugin(TargetInfo Target) public SpineEditorPlugin(ReadOnlyTargetRules Target) : base(Target)
{ {
PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public", "SpinePlugin/Public/spine-c/include" }); PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public", "SpinePlugin/Public/spine-c/include" });

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

@ -4,7 +4,7 @@ namespace UnrealBuildTool.Rules
{ {
public class SpinePlugin : ModuleRules public class SpinePlugin : ModuleRules
{ {
public SpinePlugin(TargetInfo Target) public SpinePlugin(ReadOnlyTargetRules Target) : base(Target)
{ {
PublicIncludePaths.AddRange(new string[] { "SpinePlugin/Public", "SpinePlugin/Public/spine-c/include" }); PublicIncludePaths.AddRange(new string[] { "SpinePlugin/Public", "SpinePlugin/Public/spine-c/include" });
PrivateIncludePaths.AddRange(new string[] { "SpinePlugin/Private", "SpinePlugin/Public/spine-c/include" }); PrivateIncludePaths.AddRange(new string[] { "SpinePlugin/Private", "SpinePlugin/Public/spine-c/include" });

2
spine-ue4/Source/SpineUE4.Target.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
public class SpineUE4Target : TargetRules public class SpineUE4Target : TargetRules
{ {
public SpineUE4Target(TargetInfo Target) public SpineUE4Target(ReadOnlyTargetRules Target) : base(Target)
{ {
Type = TargetType.Game; Type = TargetType.Game;
} }

2
spine-ue4/Source/SpineUE4/SpineUE4.Build.cs
View File

@ -4,7 +4,7 @@ using UnrealBuildTool;
public class SpineUE4 : ModuleRules public class SpineUE4 : ModuleRules
{ {
public SpineUE4(TargetInfo Target) public SpineUE4(ReadOnlyTargetRules Target) : base(Target)
{ {
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "ProceduralMeshComponent" }); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "ProceduralMeshComponent" });

2
spine-ue4/Source/SpineUE4Editor.Target.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
public class SpineUE4EditorTarget : TargetRules public class SpineUE4EditorTarget : TargetRules
{ {
public SpineUE4EditorTarget(TargetInfo Target) public SpineUE4EditorTarget(ReadOnlyTargetRules Target) : base(Target)
{ {
Type = TargetType.Editor; Type = TargetType.Editor;
} }