Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor

This commit is contained in:
James Chen 2013-05-10 15:54:47 +08:00
parent 42427634f2 db464530fb
commit 8ebde4df7f
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos2dx/proj.win32/cocos2d.vcxproj
View File

@ -144,6 +144,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClCompile Include="..\cocoa\CCAffineTransform.cpp" />
<ClCompile Include="..\cocoa\CCArray.cpp" />
<ClCompile Include="..\cocoa\CCAutoreleasePool.cpp" />
<ClCompile Include="..\cocoa\CCDataVisitor.cpp" />
<ClCompile Include="..\cocoa\CCDictionary.cpp" />
<ClCompile Include="..\cocoa\CCGeometry.cpp" />
<ClCompile Include="..\cocoa\CCNS.cpp" />
@ -268,7 +269,11 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClInclude Include="..\cocoa\CCAffineTransform.h" />
<ClInclude Include="..\cocoa\CCArray.h" />
<ClInclude Include="..\cocoa\CCAutoreleasePool.h" />
<ClInclude Include="..\cocoa\CCBool.h" />
<ClInclude Include="..\cocoa\CCDataVisitor.h" />
<ClInclude Include="..\cocoa\CCDictionary.h" />
<ClInclude Include="..\cocoa\CCDouble.h" />
<ClInclude Include="..\cocoa\CCFloat.h" />
<ClInclude Include="..\cocoa\CCGeometry.h" />
<ClInclude Include="..\cocoa\CCInteger.h" />
<ClInclude Include="..\cocoa\CCNS.h" />

15
cocos2dx/proj.win32/cocos2d.vcxproj.filters
View File

@ -458,6 +458,9 @@
<ClCompile Include="..\support\tinyxml2\tinyxml2.cpp">
<Filter>support\tinyxml2</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCDataVisitor.cpp">
<Filter>cocoa</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\base_nodes\CCAtlasNode.h">
@ -914,5 +917,17 @@
<ClInclude Include="..\support\tinyxml2\tinyxml2.h">
<Filter>support\tinyxml2</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCDataVisitor.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCBool.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCDouble.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCFloat.h">
<Filter>cocoa</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
View File

@ -121,6 +121,7 @@
<ItemGroup>
<ClCompile Include="..\Classes\ChipmunkTest\ChipmunkTest.cpp" />
<ClCompile Include="..\Classes\ClippingNodeTest\ClippingNodeTest.cpp" />
<ClCompile Include="..\Classes\DataVisitorTest\DataVisitorTest.cpp" />
<ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp" />
<ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.cpp" />
<ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.cpp" />
@ -215,6 +216,7 @@
<ItemGroup>
<ClInclude Include="..\Classes\ChipmunkTest\ChipmunkTest.h" />
<ClInclude Include="..\Classes\ClippingNodeTest\ClippingNodeTest.h" />
<ClInclude Include="..\Classes\DataVisitorTest\DataVisitorTest.h" />
<ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h" />
<ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h" />
<ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackLayerLoader.h" />

9
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
View File

@ -220,6 +220,9 @@
<Filter Include="Classes\TexturePackerEncryptionTest">
<UniqueIdentifier>{4031c3bb-97f8-4b43-91e5-48dd94ca2d24}</UniqueIdentifier>
</Filter>
<Filter Include="Classes\DataVisitorTest">
<UniqueIdentifier>{8049d378-12f7-46ba-ba96-091f3c0a4600}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -498,6 +501,9 @@
<ClCompile Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp">
<Filter>Classes\TexturePackerEncryptionTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\DataVisitorTest\DataVisitorTest.cpp">
<Filter>Classes\DataVisitorTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -956,5 +962,8 @@
<ClInclude Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h">
<Filter>Classes\TexturePackerEncryptionTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\DataVisitorTest\DataVisitorTest.h">
<Filter>Classes\DataVisitorTest</Filter>
</ClInclude>
</ItemGroup>
</Project>