From c40657c6e5aee85abc5fd81f7c06011fce2361e8 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 5 Mar 2016 18:56:09 +0100 Subject: [PATCH] Changed the default project setup to NOT use the Spine files in cocos2d-x. --- .../3/example/proj.win32/spine-cocos2dx.sln | 22 +++++++-------- .../example/proj.win32/spine-cocos2dx.vcxproj | 14 +++++++--- .../proj.win32/spine-cocos2dx.vcxproj.filters | 27 +++++++++++++++++++ 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.sln b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.sln index c88a24658..755f7663f 100644 --- a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.sln +++ b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.sln @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\..\cocos2dx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spine-cocos2dx", "spine-cocos2dx.vcxproj", "{DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2dx\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spine-c", "..\..\..\..\spine-c\spine-c.vcxproj", "{5D74934A-7512-45EE-8402-7B95D3642E85}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -73,16 +73,16 @@ Global {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Release|Mixed Platforms.Build.0 = Release|Win32 {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Release|Win32.ActiveCfg = Release|Win32 {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Any CPU.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Mixed Platforms.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Debug|Win32.ActiveCfg = Debug|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Debug|Win32.Build.0 = Debug|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Release|Any CPU.ActiveCfg = Release|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Release|Mixed Platforms.Build.0 = Release|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Release|Win32.ActiveCfg = Release|Win32 + {5D74934A-7512-45EE-8402-7B95D3642E85}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj index 1b311c2bb..2cea9d4b3 100644 --- a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj +++ b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj @@ -129,6 +129,10 @@ + + + + @@ -137,6 +141,10 @@ + + + + @@ -144,12 +152,12 @@ + + {5d74934a-7512-45ee-8402-7b95d3642e85} + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - {929480e7-23c0-4df6-8456-096d71547116} diff --git a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters index 6df62f8aa..20aaddefe 100644 --- a/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters +++ b/spine-cocos2dx/3/example/proj.win32/spine-cocos2dx.vcxproj.filters @@ -7,6 +7,9 @@ {0dcd52ca-d521-4ba1-a1fa-c0d58a2df402} + + {d38e21b5-cae6-46c6-99c4-33c99bc0383d} + @@ -27,6 +30,18 @@ Classes + + src + + + src + + + src + + + src + @@ -44,5 +59,17 @@ Classes + + src + + + src + + + src + + + src + \ No newline at end of file