diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index b4703e3a77..0915d8198f 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -325,7 +325,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -363,6 +362,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -725,7 +725,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -760,7 +759,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -768,6 +766,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + + diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index 6f875a692a..107f6f47e9 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -1304,7 +1304,7 @@ base\allocator - + cocostudio\reader\WidgetReader\ArmatureNode @@ -2550,10 +2550,10 @@ base\allocator - + cocostudio\reader\WidgetReader\ArmatureNode - + cocostudio\reader\WidgetReader\ArmatureNode diff --git a/cocos/2d/libcocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj index e1cd8523b0..0635673522 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -336,6 +336,7 @@ + @@ -368,6 +369,7 @@ + @@ -814,6 +816,7 @@ + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters index 0a3acd6022..1da8ca8180 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj.filters +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -242,6 +242,9 @@ {02d389d5-8f57-4bd6-b12a-95af86c5b356} + + {1dfee771-33de-4702-b4a2-a11c9446371f} + @@ -1299,9 +1302,6 @@ cocostudio\reader\WidgetReader - - cocostudio\json - cocostudio\json @@ -1311,6 +1311,9 @@ cocostudio\reader\WidgetReader\GameMapReader + + cocostudio\reader\WidgetReader\ArmatureNode + @@ -2541,6 +2544,12 @@ cocostudio\reader\WidgetReader\GameMapReader + + cocostudio\reader\WidgetReader\ArmatureNode + + + cocostudio\reader\WidgetReader\ArmatureNode + diff --git a/cocos/editor-support/cocostudio/ArmatureNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/ArmatureNodeReader.cpp rename to cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.cpp index 76667450ac..641c972c06 100644 --- a/cocos/editor-support/cocostudio/ArmatureNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.cpp @@ -3,7 +3,7 @@ #include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "cocostudio/CSParseBinary_generated.h" #include "CSArmatureNode_generated.h" -#include "cocostudio/ArmatureNodeReader.h" +#include "cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h" #include "cocostudio/CCArmature.h" diff --git a/cocos/editor-support/cocostudio/ArmatureNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h similarity index 100% rename from cocos/editor-support/cocostudio/ArmatureNodeReader.h rename to cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h diff --git a/cocos/editor-support/cocostudio/CSArmatureNode_generated.h b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/CSArmatureNode_generated.h similarity index 100% rename from cocos/editor-support/cocostudio/CSArmatureNode_generated.h rename to cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/CSArmatureNode_generated.h