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

Merge pull request #270 from yangws/vs2010 

compile ok in vs2010
This commit is contained in:
Walzer 2011-05-12 01:59:24 -07:00
parent 6d07417c60 c73c1a9ab6
commit 7874ec5305
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,6 +188,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\support\CCArray.cpp" /> <ClCompile Include="..\support\CCArray.cpp" />
<ClCompile Include="..\support\CCPointExtension.cpp" /> <ClCompile Include="..\support\CCPointExtension.cpp" />
<ClCompile Include="..\support\CCProfiling.cpp" /> <ClCompile Include="..\support\CCProfiling.cpp" />
<ClCompile Include="..\support\CCUserDefault.cpp" />
<ClCompile Include="..\support\ccUtils.cpp" /> <ClCompile Include="..\support\ccUtils.cpp" />
<ClCompile Include="..\support\TransformUtils.cpp" /> <ClCompile Include="..\support\TransformUtils.cpp" />
<ClCompile Include="..\support\image_support\TGAlib.cpp" /> <ClCompile Include="..\support\image_support\TGAlib.cpp" />
@ -304,6 +305,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClInclude Include="..\include\CCTransitionPageTurn.h" /> <ClInclude Include="..\include\CCTransitionPageTurn.h" />
<ClInclude Include="..\include\CCTransitionRadial.h" /> <ClInclude Include="..\include\CCTransitionRadial.h" />
<ClInclude Include="..\include\ccTypes.h" /> <ClInclude Include="..\include\ccTypes.h" />
<ClInclude Include="..\include\CCUserDefault.h" />
<ClInclude Include="..\include\CCZone.h" /> <ClInclude Include="..\include\CCZone.h" />
<ClInclude Include="..\include\cocos2d.h" /> <ClInclude Include="..\include\cocos2d.h" />
<ClInclude Include="..\include\FileUtils.h" /> <ClInclude Include="..\include\FileUtils.h" />

6
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
View File

@ -327,6 +327,9 @@
<ClCompile Include="..\menu_nodes\CCMenu.cpp"> <ClCompile Include="..\menu_nodes\CCMenu.cpp">
<Filter>menu_nodes</Filter> <Filter>menu_nodes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\support\CCUserDefault.cpp">
<Filter>support</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\effects\CCGrabber.h"> <ClInclude Include="..\effects\CCGrabber.h">
@ -699,5 +702,8 @@
<ClInclude Include="..\include\CCIMEDispatcher.h"> <ClInclude Include="..\include\CCIMEDispatcher.h">
<Filter>include</Filter> <Filter>include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\CCUserDefault.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
tests/test.win32/test.win32.vcxproj
View File

@ -106,6 +106,7 @@
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\tests\UserDefaultTest\UserDefaultTest.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="..\AppDelegate.cpp" /> <ClCompile Include="..\AppDelegate.cpp" />
<ClCompile Include="..\tests\controller.cpp" /> <ClCompile Include="..\tests\controller.cpp" />
@ -175,6 +176,7 @@
<ClCompile Include="..\tests\TextInputTest\TextInputTest.cpp" /> <ClCompile Include="..\tests\TextInputTest\TextInputTest.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\tests\UserDefaultTest\UserDefaultTest.h" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
<ClInclude Include="..\AppDelegate.h" /> <ClInclude Include="..\AppDelegate.h" />
<ClInclude Include="..\tests\controller.h" /> <ClInclude Include="..\tests\controller.h" />

9
tests/test.win32/test.win32.vcxproj.filters
View File

@ -115,6 +115,9 @@
<Filter Include="classes\tests\TextInputTest"> <Filter Include="classes\tests\TextInputTest">
<UniqueIdentifier>{3cbe9845-8408-4456-8928-00452f1e7cce}</UniqueIdentifier> <UniqueIdentifier>{3cbe9845-8408-4456-8928-00452f1e7cce}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="classes\tests\UserDefaultTest">
<UniqueIdentifier>{f9810289-ecfc-4775-81f1-06ccf227b715}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
@ -318,6 +321,9 @@
<ClCompile Include="..\tests\TextInputTest\TextInputTest.cpp"> <ClCompile Include="..\tests\TextInputTest\TextInputTest.cpp">
<Filter>classes\tests\TextInputTest</Filter> <Filter>classes\tests\TextInputTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\tests\UserDefaultTest\UserDefaultTest.cpp">
<Filter>classes\tests\UserDefaultTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="main.h"> <ClInclude Include="main.h">
@ -584,5 +590,8 @@
<ClInclude Include="..\tests\TextInputTest\TextInputTest.h"> <ClInclude Include="..\tests\TextInputTest\TextInputTest.h">
<Filter>classes\tests\TextInputTest</Filter> <Filter>classes\tests\TextInputTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\tests\UserDefaultTest\UserDefaultTest.h">
<Filter>classes\tests\UserDefaultTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>