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

issue #2161: resolve conflict

This commit is contained in:
minggo 2013-05-28 11:50:14 +08:00
parent 6f624351b3 d6e547cd02
commit 5f37e854c4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,6 +230,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClCompile Include="..\textures\CCTexture2D.cpp" /> <ClCompile Include="..\textures\CCTexture2D.cpp" />
<ClCompile Include="..\textures\CCTextureAtlas.cpp" /> <ClCompile Include="..\textures\CCTextureAtlas.cpp" />
<ClCompile Include="..\textures\CCTextureCache.cpp" /> <ClCompile Include="..\textures\CCTextureCache.cpp" />
<ClCompile Include="..\textures\CCTextureETC.cpp" />
<ClCompile Include="..\textures\CCTexturePVR.cpp" /> <ClCompile Include="..\textures\CCTexturePVR.cpp" />
<ClCompile Include="..\tileMap_parallax_nodes\CCParallaxNode.cpp" /> <ClCompile Include="..\tileMap_parallax_nodes\CCParallaxNode.cpp" />
<ClCompile Include="..\tileMap_parallax_nodes\CCTileMapAtlas.cpp" /> <ClCompile Include="..\tileMap_parallax_nodes\CCTileMapAtlas.cpp" />
@ -389,6 +390,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClInclude Include="..\textures\CCTexture2D.h" /> <ClInclude Include="..\textures\CCTexture2D.h" />
<ClInclude Include="..\textures\CCTextureAtlas.h" /> <ClInclude Include="..\textures\CCTextureAtlas.h" />
<ClInclude Include="..\textures\CCTextureCache.h" /> <ClInclude Include="..\textures\CCTextureCache.h" />
<ClInclude Include="..\textures\CCTextureETC.h" />
<ClInclude Include="..\textures\CCTexturePVR.h" /> <ClInclude Include="..\textures\CCTexturePVR.h" />
<ClInclude Include="..\tileMap_parallax_nodes\CCParallaxNode.h" /> <ClInclude Include="..\tileMap_parallax_nodes\CCParallaxNode.h" />
<ClInclude Include="..\tileMap_parallax_nodes\CCTileMapAtlas.h" /> <ClInclude Include="..\tileMap_parallax_nodes\CCTileMapAtlas.h" />

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="base_nodes"> <Filter Include="base_nodes">
@ -462,6 +462,9 @@
<Filter>cocoa</Filter> <Filter>cocoa</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\ccFPSImages.c" /> <ClCompile Include="..\ccFPSImages.c" />
<ClCompile Include="..\textures\CCTextureETC.cpp">
<Filter>textures</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\base_nodes\CCAtlasNode.h"> <ClInclude Include="..\base_nodes\CCAtlasNode.h">
@ -930,6 +933,8 @@
<ClInclude Include="..\cocoa\CCFloat.h"> <ClInclude Include="..\cocoa\CCFloat.h">
<Filter>cocoa</Filter> <Filter>cocoa</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\ccFPSImages.h" /> <ClInclude Include="..\textures\CCTextureETC.h">
<Filter>textures</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>