Merge branch 'master' into 3.6-beta

This commit is contained in:
badlogic 2017-05-24 11:26:04 +02:00
commit 9c38d3faf0
2 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -103,3 +103,4 @@ spine-ue4/Plugins/SpinePlugin/Binaries
spine-ue4/SpineUE4.VC.opendb
spine-ue4/SpineUE4.VC.db
spine-ue4/SpineUE4.sln
spine-ue4/SpineUE4.VC.db

View File

@ -6,9 +6,9 @@ namespace UnrealBuildTool.Rules
{
public SpineEditorPlugin(TargetInfo Target)
{
PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public" });
PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public", "SpinePlugin/Public/spine-c/include" });
PrivateIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Private" });
PrivateIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Private", "SpinePlugin/Public/spine-c/include" });
PublicDependencyModuleNames.AddRange(new string[] {
"Core",