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

Merge pull request #12987 from MSOpenTech/v3-win10-fix 

V3 win10 fix
This commit is contained in:
Ricardo Quesada 2015-07-23 13:54:03 -07:00
parent a78d55a897 72427a0a64
commit 292987d393
5 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
View File

@ -119,40 +119,40 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental> <LinkIncremental>
</LinkIncremental> </LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental> <LinkIncremental>
</LinkIncremental> </LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental> <LinkIncremental>
</LinkIncremental> </LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_8.1</TargetName> <TargetName>libcocos2d_v3.8_Windows_8.1</TargetName>
<LinkIncremental> <LinkIncremental>
</LinkIncremental> </LinkIncremental>
</PropertyGroup> </PropertyGroup>

8
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
View File

@ -91,23 +91,23 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_WindowsPhone_8.1</TargetName> <TargetName>libcocos2d_v3.8_WindowsPhone_8.1</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_WindowsPhone_8.1</TargetName> <TargetName>libcocos2d_v3.8_WindowsPhone_8.1</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_WindowsPhone_8.1</TargetName> <TargetName>libcocos2d_v3.8_WindowsPhone_8.1</TargetName>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_WindowsPhone_8.1</TargetName> <TargetName>libcocos2d_v3.8_WindowsPhone_8.1</TargetName>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

12
cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
View File

@ -1491,34 +1491,34 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>libcocos2d_v3.7_Windows_10.0</TargetName> <TargetName>libcocos2d_v3.8_Windows_10.0</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>

2
tests/cpp-tests/proj.win10/cpp-tests.vcxproj
View File

@ -298,6 +298,7 @@
<ClInclude Include="..\Classes\Box2DTestBed\Tests\VerticalStack.h" /> <ClInclude Include="..\Classes\Box2DTestBed\Tests\VerticalStack.h" />
<ClInclude Include="..\Classes\Box2DTestBed\Tests\Web.h" /> <ClInclude Include="..\Classes\Box2DTestBed\Tests\Web.h" />
<ClInclude Include="..\Classes\Box2DTest\Box2dTest.h" /> <ClInclude Include="..\Classes\Box2DTest\Box2dTest.h" />
<ClInclude Include="..\Classes\BugsTest\Bug-12847.h" />
<ClInclude Include="..\Classes\BugsTest\Bug-CCDrawNode.h" /> <ClInclude Include="..\Classes\BugsTest\Bug-CCDrawNode.h" />
<ClInclude Include="..\Classes\BugsTest\Bug-PageViewLayout.h" /> <ClInclude Include="..\Classes\BugsTest\Bug-PageViewLayout.h" />
<ClInclude Include="..\Classes\BugsTest\Bug-1159.h" /> <ClInclude Include="..\Classes\BugsTest\Bug-1159.h" />
@ -549,6 +550,7 @@
<ClCompile Include="..\Classes\Box2DTestBed\Test.cpp" /> <ClCompile Include="..\Classes\Box2DTestBed\Test.cpp" />
<ClCompile Include="..\Classes\Box2DTestBed\TestEntries.cpp" /> <ClCompile Include="..\Classes\Box2DTestBed\TestEntries.cpp" />
<ClCompile Include="..\Classes\Box2DTest\Box2dTest.cpp" /> <ClCompile Include="..\Classes\Box2DTest\Box2dTest.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-12847.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-CCDrawNode.cpp" /> <ClCompile Include="..\Classes\BugsTest\Bug-CCDrawNode.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-PageViewLayout.cpp" /> <ClCompile Include="..\Classes\BugsTest\Bug-PageViewLayout.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-1159.cpp" /> <ClCompile Include="..\Classes\BugsTest\Bug-1159.cpp" />

10
tests/cpp-tests/proj.win10/cpp-tests.vcxproj.filters
View File

@ -875,9 +875,6 @@
<ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest_Editor.cpp"> <ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest_Editor.cpp">
<Filter>Classes\UITest\CocoStudioGUITest\UICheckBoxTest</Filter> <Filter>Classes\UITest\CocoStudioGUITest\UICheckBoxTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UIRadioButtonTest\UIRadioButtonTest.cpp">
<Filter>Classes\UITest\CocoStudioGUITest\UIRadioButtonTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UIFocusTest\UIFocusTest.cpp"> <ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UIFocusTest\UIFocusTest.cpp">
<Filter>Classes\UITest\CocoStudioGUITest\UIFocusTest</Filter> <Filter>Classes\UITest\CocoStudioGUITest\UIFocusTest</Filter>
</ClCompile> </ClCompile>
@ -993,6 +990,10 @@
<ClCompile Include="..\Classes\NavMeshTest\NavMeshTest.cpp"> <ClCompile Include="..\Classes\NavMeshTest\NavMeshTest.cpp">
<Filter>Classes\NavMeshTest</Filter> <Filter>Classes\NavMeshTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UIRadioButtonTest\UIRadioButtonTest.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-12847.cpp">
<Filter>Classes\BugsTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="App.xaml.h" /> <ClInclude Include="App.xaml.h" />
@ -1792,6 +1793,9 @@
<ClInclude Include="..\Classes\NavMeshTest\NavMeshTest.h"> <ClInclude Include="..\Classes\NavMeshTest\NavMeshTest.h">
<Filter>Classes\NavMeshTest</Filter> <Filter>Classes\NavMeshTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Classes\BugsTest\Bug-12847.h">
<Filter>Classes\BugsTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\WideLogo.scale-100.png"> <Image Include="Assets\WideLogo.scale-100.png">