From 7f58a2f5da82fb393760e54cf1f1e377e2cb469e Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Thu, 12 Dec 2019 15:12:11 +0100
Subject: [PATCH] [cocos2dx] Fix VS solution and instructions.

---
 .../proj.win32/spine-cocos2d-x.vcxproj        | 12 +++---
 .../spine-cocos2d-x.vcxproj.filters           | 42 +++++++++++--------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj
index fa1df7380..ec0df170f 100644
--- a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj
+++ b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(EngineRoot)external;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END);$(SolutionDir)..\..\..\spine-cpp\spine-cpp\include;$(SolutionDir)..\..\src;$(IncludePath)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(EngineRoot)external;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END);..\..\..\spine-cpp\spine-cpp\include;$(SolutionDir)..\..\src;$(IncludePath)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -203,14 +203,15 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\Resources" /D /E /I /F /Y
     <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\VertexEffect.cpp" />
     <ClCompile Include="..\..\src\spine\AttachmentVertices.cpp" />
     <ClCompile Include="..\..\src\spine\SkeletonAnimation.cpp" />
-    <ClCompile Include="..\..\src\spine\SkeletonBatch.cpp" />
+    <ClCompile Include="..\..\src\spine\v3\SkeletonBatch.cpp" />
     <ClCompile Include="..\..\src\spine\SkeletonRenderer.cpp" />
-    <ClCompile Include="..\..\src\spine\SkeletonTwoColorBatch.cpp" />
+    <ClCompile Include="..\..\src\spine\v3\SkeletonTwoColorBatch.cpp" />
     <ClCompile Include="..\..\src\spine\spine-cocos2dx.cpp" />
     <ClCompile Include="..\Classes\AppDelegate.cpp" />
     <ClCompile Include="..\Classes\BatchingExample.cpp" />
     <ClCompile Include="..\Classes\CoinExample.cpp" />
     <ClCompile Include="..\Classes\GoblinsExample.cpp" />
+    <ClCompile Include="..\Classes\IKExample.cpp" />
     <ClCompile Include="..\Classes\MixAndMatchExample.cpp" />
     <ClCompile Include="..\Classes\RaptorExample.cpp" />
     <ClCompile Include="..\Classes\SkeletonRendererSeparatorExample.cpp" />
@@ -300,15 +301,16 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\Resources" /D /E /I /F /Y
     <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vertices.h" />
     <ClInclude Include="..\..\src\spine\AttachmentVertices.h" />
     <ClInclude Include="..\..\src\spine\SkeletonAnimation.h" />
-    <ClInclude Include="..\..\src\spine\SkeletonBatch.h" />
+    <ClInclude Include="..\..\src\spine\v3\SkeletonBatch.h" />
     <ClInclude Include="..\..\src\spine\SkeletonRenderer.h" />
-    <ClInclude Include="..\..\src\spine\SkeletonTwoColorBatch.h" />
+    <ClInclude Include="..\..\src\spine\v3\SkeletonTwoColorBatch.h" />
     <ClInclude Include="..\..\src\spine\spine-cocos2dx.h" />
     <ClInclude Include="..\Classes\AppDelegate.h" />
     <ClInclude Include="..\Classes\AppMacros.h" />
     <ClInclude Include="..\Classes\BatchingExample.h" />
     <ClInclude Include="..\Classes\CoinExample.h" />
     <ClInclude Include="..\Classes\GoblinsExample.h" />
+    <ClInclude Include="..\Classes\IKExample.h" />
     <ClInclude Include="..\Classes\MixAndMatchExample.h" />
     <ClInclude Include="..\Classes\RaptorExample.h" />
     <ClInclude Include="..\Classes\SkeletonRendererSeparatorExample.h" />
diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters
index 8b7720b34..ec494f191 100644
--- a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters
+++ b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters
@@ -27,15 +27,6 @@
     <ClCompile Include="..\..\src\spine\SkeletonAnimation.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spine\SkeletonBatch.cpp">
-      <Filter>spine-cocos2dx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spine\SkeletonRenderer.cpp">
-      <Filter>spine-cocos2dx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spine\SkeletonTwoColorBatch.cpp">
-      <Filter>spine-cocos2dx</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\spine\spine-cocos2dx.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
@@ -249,6 +240,18 @@
     <ClCompile Include="..\Classes\MixAndMatchExample.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\spine\v3\SkeletonBatch.cpp">
+      <Filter>spine-cocos2dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spine\v3\SkeletonTwoColorBatch.cpp">
+      <Filter>spine-cocos2dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spine\SkeletonRenderer.cpp">
+      <Filter>spine-cocos2dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\IKExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
@@ -260,15 +263,6 @@
     <ClInclude Include="..\..\src\spine\SkeletonAnimation.h">
       <Filter>spine-cocos2dx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonBatch.h">
-      <Filter>spine-cocos2dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonRenderer.h">
-      <Filter>spine-cocos2dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonTwoColorBatch.h">
-      <Filter>spine-cocos2dx</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\spine\spine-cocos2dx.h">
       <Filter>spine-cocos2dx</Filter>
     </ClInclude>
@@ -539,6 +533,18 @@
     <ClInclude Include="..\Classes\MixAndMatchExample.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spine\v3\SkeletonBatch.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\v3\SkeletonTwoColorBatch.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\SkeletonRenderer.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\IKExample.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="game.rc">