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

Merge branch 'arm64-juno' of https://github.com/dumganhar/cocos2d-x into arm64-juno

This commit is contained in:
James Chen 2014-11-25 17:03:28 +08:00
parent 6998d91781 26ac8aedae
commit 15333ca517
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems
View File

@ -119,6 +119,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceContainerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceLabelTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceMathTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceNodeChildrenTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceParticleTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceRendererTest.cpp" />
@ -372,6 +373,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceContainerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceLabelTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceMathTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceNodeChildrenTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceParticleTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceRendererTest.h" />

6
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
View File

@ -751,6 +751,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest_Editor.cpp">
<Filter>Classes\UITest\CocostudioGUISceneTest\UITextFieldTest</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceMathTest.cpp">
<Filter>Classes\PerformanceTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.cpp">
@ -1647,5 +1650,8 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceMathTest.h">
<Filter>Classes\PerformanceTest</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
View File

@ -235,6 +235,7 @@
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceContainerTest.cpp" />
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.cpp" />
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceLabelTest.cpp" />
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceMathTest.cpp" />
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceRendererTest.cpp" />
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceScenarioTest.cpp" />
<ClCompile Include="..\..\Classes\PhysicsTest\PhysicsTest.cpp" />
@ -432,6 +433,7 @@
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceContainerTest.h" />
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.h" />
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceLabelTest.h" />
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceMathTest.h" />
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceRendererTest.h" />
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceScenarioTest.h" />
<ClInclude Include="..\..\Classes\PhysicsTest\PhysicsTest.h" />

6
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
View File

@ -885,6 +885,9 @@
<ClCompile Include="..\..\Classes\ExtensionsTest\AssetsManagerExTest\AssetsManagerExTest.cpp">
<Filter>Classes\ExtensionsTest\AssetsManagerExLoaderScene</Filter>
</ClCompile>
<ClCompile Include="..\..\Classes\PerformanceTest\PerformanceMathTest.cpp">
<Filter>Classes\PerformanceTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Classes\AppDelegate.h">
@ -1632,6 +1635,9 @@
<ClInclude Include="..\..\Classes\ExtensionsTest\AssetsManagerExTest\AssetsManagerExTest.h">
<Filter>Classes\ExtensionsTest\AssetsManagerExLoaderScene</Filter>
</ClInclude>
<ClInclude Include="..\..\Classes\PerformanceTest\PerformanceMathTest.h">
<Filter>Classes\PerformanceTest</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="$(AngleBinPath)libEGL_phone.dll" />