From d224c77bd418bd8d80d2e4af712043df71671931 Mon Sep 17 00:00:00 2001 From: zhangbin <zhangbin@cocos2d-x.org> Date: Thu, 31 Jul 2014 17:51:06 +0800 Subject: [PATCH] Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. --- cocos/2d/cocos2d_wp8.vcxproj | 2 ++ cocos/2d/cocos2d_wp8.vcxproj.filters | 9 ++++++--- cocos/ui/proj.wp8/libGUI.vcxproj | 2 -- cocos/ui/proj.wp8/libGUI.vcxproj.filters | 6 ------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index f6416d1bca..de069cf89b 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -406,6 +406,7 @@ <ClCompile Include="CCParticleSystem.cpp" /> <ClCompile Include="CCParticleSystemQuad.cpp" /> <ClCompile Include="CCProgressTimer.cpp" /> + <ClCompile Include="CCProtectedNode.cpp" /> <ClCompile Include="CCRenderTexture.cpp" /> <ClCompile Include="CCScene.cpp" /> <ClCompile Include="CCSprite.cpp" /> @@ -622,6 +623,7 @@ <ClInclude Include="CCParticleSystem.h" /> <ClInclude Include="CCParticleSystemQuad.h" /> <ClInclude Include="CCProgressTimer.h" /> + <ClInclude Include="CCProtectedNode.h" /> <ClInclude Include="CCRenderTexture.h" /> <ClInclude Include="CCScene.h" /> <ClInclude Include="CCSprite.h" /> diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index a00fbb84f3..30c158ceac 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -490,9 +490,6 @@ <ClCompile Include="..\base\CCUserDefault.cpp"> <Filter>base</Filter> </ClCompile> - <ClCompile Include="..\base\CCUserDefaultAndroid.cpp"> - <Filter>base</Filter> - </ClCompile> <ClCompile Include="..\base\ccUTF8.cpp"> <Filter>base</Filter> </ClCompile> @@ -617,6 +614,9 @@ <ClCompile Include="CCFastTMXTiledMap.cpp"> <Filter>2d</Filter> </ClCompile> + <ClCompile Include="CCProtectedNode.cpp"> + <Filter>2d</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\physics\CCPhysicsBody.h"> @@ -1259,6 +1259,9 @@ <ClInclude Include="CCFastTMXTiledMap.h"> <Filter>2d</Filter> </ClInclude> + <ClInclude Include="CCProtectedNode.h"> + <Filter>2d</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\math\Mat4.inl"> diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj b/cocos/ui/proj.wp8/libGUI.vcxproj index 69d0320b3a..5e2e4e6453 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj +++ b/cocos/ui/proj.wp8/libGUI.vcxproj @@ -165,7 +165,6 @@ <ImportGroup Label="ExtensionTargets"> </ImportGroup> <ItemGroup> - <ClInclude Include="..\..\ui\CCProtectedNode.h" /> <ClInclude Include="..\..\ui\CocosGUI.h" /> <ClInclude Include="..\..\ui\UIButton.h" /> <ClInclude Include="..\..\ui\UIHelper.h" /> @@ -191,7 +190,6 @@ <ClInclude Include="..\UIScale9Sprite.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\ui\CCProtectedNode.cpp" /> <ClCompile Include="..\..\ui\CocosGUI.cpp" /> <ClCompile Include="..\..\ui\UIButton.cpp" /> <ClCompile Include="..\..\ui\UICheckBox.cpp" /> diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj.filters b/cocos/ui/proj.wp8/libGUI.vcxproj.filters index 29bc02c4f4..7a7b4ae6b4 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj.filters +++ b/cocos/ui/proj.wp8/libGUI.vcxproj.filters @@ -69,9 +69,6 @@ <ClInclude Include="..\..\ui\UIWidget.h"> <Filter>BaseClasses</Filter> </ClInclude> - <ClInclude Include="..\..\ui\CCProtectedNode.h"> - <Filter>BaseClasses</Filter> - </ClInclude> <ClInclude Include="..\..\ui\UIVBox.h"> <Filter>Layouts</Filter> </ClInclude> @@ -146,9 +143,6 @@ <ClCompile Include="..\..\ui\UIWidget.cpp"> <Filter>BaseClasses</Filter> </ClCompile> - <ClCompile Include="..\..\ui\CCProtectedNode.cpp"> - <Filter>BaseClasses</Filter> - </ClCompile> <ClCompile Include="..\..\ui\UIVBox.cpp"> <Filter>Layouts</Filter> </ClCompile>