diff --git a/.gitignore b/.gitignore index 863d29c9fd..270f81832d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,8 @@ _ReSharper*/ [Tt]est[Rr]esult* ipch/ *.opensdf +SubmissionInfo +Generated Files # Ignore files build by ndk and eclipse libs/ @@ -133,7 +135,9 @@ project.properties /external/websockets/ /external/win32-specific/ /external/winrt-specific/ +/external/winrt_8.1-specific/ /external/wp8-specific/ +/external/wp_8.1-specific/ /external/version.json /templates/lua-template-runtime/runtime /v*-deps-*.zip diff --git a/build/cocos2d-wp8.vc2012.sln b/build/cocos2d-wp8.sln similarity index 52% rename from build/cocos2d-wp8.vc2012.sln rename to build/cocos2d-wp8.sln index 8a9fce10df..04ac85839f 100644 --- a/build/cocos2d-wp8.vc2012.sln +++ b/build/cocos2d-wp8.sln @@ -1,41 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.wp8\libCocosStudio.vcxproj", "{51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.wp8\libCocosBuilder.vcxproj", "{20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.wp8\libExtensions.vcxproj", "{04A0C42F-23BB-469B-A9D8-CA49136ADBD4}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\external\Box2D\proj.wp8\Box2D.vcxproj", "{C55734A3-702C-4FA1-B950-32C8E169302F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.wp8\libLocalStorage.vcxproj", "{88982C27-5A7B-40A8-86E7-B3187B44B322}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "..\cocos\audio\proj.wp8\CocosDenshion.vcxproj", "{DF125891-EEE9-4466-B903-F828FD272158}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-tests", "cpp-tests", "{671E147E-1DBD-41FC-99B3-2119CA828C8A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-tests\proj.wp8-xaml\cpp-tests\cpp-tests.csproj", "{60D53713-1675-4466-81DC-D67A031C3D21}" @@ -45,11 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-t EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-testsComponent", "..\tests\cpp-tests\proj.wp8-xaml\cpp-testsComponent\cpp-testsComponent.vcxproj", "{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.wp8\libNetwork.vcxproj", "{7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-empty-test", "cpp-empty-test", "{2C306303-EB4F-4058-8CA0-1F28A4FECE39}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-test\cpp-empty-test.csproj", "{5921FE12-7EF3-4847-8453-42EF286DDBE7}" @@ -59,11 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-testComponent", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-testComponent\cpp-empty-testComponent.vcxproj", "{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.wp8\libGUI.vcxproj", "{08FB23E4-1517-4EDC-B682-DA238CDAA83D}" - ProjectSection(ProjectDependencies) = postProject - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}" ProjectSection(ProjectDependencies) = postProject {5921FE12-7EF3-4847-8453-42EF286DDBE7} = {5921FE12-7EF3-4847-8453-42EF286DDBE7} @@ -72,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\coc {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_wp8", "..\cocos\2d\libcocos2d_wp8.vcxproj", "{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,26 +50,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|ARM.ActiveCfg = Debug|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|ARM.Build.0 = Debug|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Win32.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|x64.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|x86.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|x86.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Any CPU.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|ARM.ActiveCfg = Release|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|ARM.Build.0 = Release|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Mixed Platforms.Build.0 = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Win32.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Win32.Build.0 = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|x64.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|x86.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|x86.Build.0 = Release|Win32 {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.ActiveCfg = Debug|ARM {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.Build.0 = Debug|ARM @@ -128,66 +70,6 @@ Global {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x64.ActiveCfg = Release|Win32 {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.ActiveCfg = Release|Win32 {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|ARM.ActiveCfg = Debug|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|ARM.Build.0 = Debug|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Win32.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Win32.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|x64.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|x86.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|x86.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Any CPU.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|ARM.ActiveCfg = Release|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|ARM.Build.0 = Release|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Win32.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Win32.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|x64.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|x86.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|x86.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|ARM.ActiveCfg = Debug|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|ARM.Build.0 = Debug|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Win32.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|x64.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|x86.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|x86.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Any CPU.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|ARM.ActiveCfg = Release|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|ARM.Build.0 = Release|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Mixed Platforms.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Win32.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Win32.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|x64.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|x86.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|x86.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|ARM.ActiveCfg = Debug|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|ARM.Build.0 = Debug|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Win32.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Win32.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|x64.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|x86.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|x86.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Any CPU.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|ARM.ActiveCfg = Release|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|ARM.Build.0 = Release|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Mixed Platforms.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Win32.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Win32.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|x64.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|x86.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|x86.Build.0 = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.ActiveCfg = Debug|ARM {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.Build.0 = Debug|ARM @@ -208,46 +90,6 @@ Global {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x64.ActiveCfg = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.ActiveCfg = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.ActiveCfg = Debug|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.Build.0 = Debug|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Win32.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Win32.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|x64.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|x86.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|x86.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Any CPU.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|ARM.ActiveCfg = Release|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|ARM.Build.0 = Release|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Mixed Platforms.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Win32.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Win32.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|x64.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|x86.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|x86.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|ARM.ActiveCfg = Debug|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|ARM.Build.0 = Debug|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Win32.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|x64.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|x86.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|x86.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Any CPU.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|ARM.ActiveCfg = Release|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Release|ARM.Build.0 = Release|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Mixed Platforms.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Win32.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Win32.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|x64.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|x86.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|x86.Build.0 = Release|Win32 {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.Build.0 = Debug|Any CPU {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -300,26 +142,6 @@ Global {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x64.ActiveCfg = Release|Win32 {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x86.ActiveCfg = Release|Win32 {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x86.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|ARM.ActiveCfg = Debug|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|ARM.Build.0 = Debug|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Win32.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|x64.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|x86.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|x86.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Any CPU.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|ARM.ActiveCfg = Release|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|ARM.Build.0 = Release|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Win32.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Win32.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|x64.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|x86.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|x86.Build.0 = Release|Win32 {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -372,26 +194,6 @@ Global {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x64.ActiveCfg = Release|Win32 {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.ActiveCfg = Release|Win32 {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.ActiveCfg = Debug|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.Build.0 = Debug|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Win32.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Win32.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|x64.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|x86.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|x86.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Any CPU.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|ARM.ActiveCfg = Release|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|ARM.Build.0 = Release|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Win32.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Win32.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x64.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.Build.0 = Release|Win32 {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.ActiveCfg = Debug|ARM {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.Build.0 = Debug|ARM @@ -412,6 +214,26 @@ Global {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x64.ActiveCfg = Release|Win32 {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.ActiveCfg = Release|Win32 {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.ActiveCfg = Debug|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.Build.0 = Debug|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x64.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Any CPU.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.ActiveCfg = Release|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.Build.0 = Release|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x64.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/winrt/Cocos2dShaderCompiler/Assets/Logo.png b/build/winrt/Cocos2dShaderCompiler/Assets/Logo.png deleted file mode 100644 index e26771cb33..0000000000 Binary files a/build/winrt/Cocos2dShaderCompiler/Assets/Logo.png and /dev/null differ diff --git a/build/winrt/Cocos2dShaderCompiler/Assets/SmallLogo.png b/build/winrt/Cocos2dShaderCompiler/Assets/SmallLogo.png deleted file mode 100644 index 1eb0d9d528..0000000000 Binary files a/build/winrt/Cocos2dShaderCompiler/Assets/SmallLogo.png and /dev/null differ diff --git a/build/winrt/Cocos2dShaderCompiler/Assets/SplashScreen.png b/build/winrt/Cocos2dShaderCompiler/Assets/SplashScreen.png deleted file mode 100644 index c951e031bd..0000000000 Binary files a/build/winrt/Cocos2dShaderCompiler/Assets/SplashScreen.png and /dev/null differ diff --git a/build/winrt/Cocos2dShaderCompiler/Assets/StoreLogo.png b/build/winrt/Cocos2dShaderCompiler/Assets/StoreLogo.png deleted file mode 100644 index dcb672712c..0000000000 Binary files a/build/winrt/Cocos2dShaderCompiler/Assets/StoreLogo.png and /dev/null differ diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln deleted file mode 100644 index 19e9068b62..0000000000 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln +++ /dev/null @@ -1,54 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\..\cocos\2d\cocos2d_winrt.vcxproj", "{2330EDF4-5596-4B53-8BA5-158DDDE713D9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.ActiveCfg = Debug|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Build.0 = Debug|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Deploy.0 = Debug|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Build.0 = Debug|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Deploy.0 = Debug|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.ActiveCfg = Debug|x64 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Build.0 = Debug|x64 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Deploy.0 = Debug|x64 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.ActiveCfg = Release|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Build.0 = Release|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Deploy.0 = Release|ARM - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.ActiveCfg = Release|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Build.0 = Release|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Deploy.0 = Release|Win32 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.ActiveCfg = Release|x64 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Build.0 = Release|x64 - {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Deploy.0 = Release|x64 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|ARM.ActiveCfg = Debug|ARM - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|ARM.Build.0 = Debug|ARM - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|Win32.ActiveCfg = Debug|Win32 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|Win32.Build.0 = Debug|Win32 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|x64.ActiveCfg = Debug|x64 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|x64.Build.0 = Debug|x64 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|ARM.ActiveCfg = Release|ARM - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|ARM.Build.0 = Release|ARM - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|Win32.ActiveCfg = Release|Win32 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|Win32.Build.0 = Release|Win32 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|x64.ActiveCfg = Release|x64 - {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj deleted file mode 100644 index 241f6f7220..0000000000 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj +++ /dev/null @@ -1,259 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - - {4f6def20-ac4c-487f-85b8-5993519e3911} - Cocos2dShaderCompiler - en-US - 12.0 - true - Windows Store - 8.1 - - - - Application - true - v120 - - - Application - true - v120 - - - Application - true - v120 - - - Application - false - true - v120 - - - Application - false - true - v120 - - - Application - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cocos2dShaderCompiler_TemporaryKey.pfx - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store;$(VCInstallDir)\lib - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204;4996; - WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - - - - - - - App.xaml - - - DirectXPage.xaml - - - - - - App.xaml - - - DirectXPage.xaml - - - - - - Designer - - - true - true - - - true - true - - - - - - Designer - - - Designer - - - - - {2330edf4-5596-4b53-8ba5-158ddde713d9} - - - - - - - - - \ No newline at end of file diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters deleted file mode 100644 index 1a0d3d8faf..0000000000 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 5a7dfab3-eb13-41b4-a863-3136f23cdca2 - bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png - - - Assets - - - Assets - - - Assets - - - Assets - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/winrt/Cocos2dShaderCompiler/App.xaml b/build/wp8/Cocos2dShaderCompiler/App.xaml similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/App.xaml rename to build/wp8/Cocos2dShaderCompiler/App.xaml diff --git a/build/winrt/Cocos2dShaderCompiler/App.xaml.cpp b/build/wp8/Cocos2dShaderCompiler/App.xaml.cpp similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/App.xaml.cpp rename to build/wp8/Cocos2dShaderCompiler/App.xaml.cpp diff --git a/build/winrt/Cocos2dShaderCompiler/App.xaml.h b/build/wp8/Cocos2dShaderCompiler/App.xaml.h similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/App.xaml.h rename to build/wp8/Cocos2dShaderCompiler/App.xaml.h diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln new file mode 100644 index 0000000000..481fbd3963 --- /dev/null +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln @@ -0,0 +1,98 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{29321038-F308-421E-B8CA-140BB23D3C6D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{ECA7A2AA-8501-4177-8360-322A569B6C3E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Box2D", "Box2D", "{7CA66464-6A5E-493B-82EF-DBD84F91766F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libSpine", "libSpine", "{8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d.Shared", "..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems", "{4A3C6BA8-C227-498B-AA21-40BDA27B461F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d.Windows", "..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Windows\libbox2d.Windows.vcxproj", "{3B26A12D-3A44-47EA-82D2-282660FC844D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Shared", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems", "{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Windows", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Windows\libSpine.Windows.vcxproj", "{F3550FE0-C795-44F6-8FEB-093EB68143AE}" +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9 + ..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9 + ..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9 + ..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4 + ..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.ActiveCfg = Debug|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Build.0 = Debug|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Deploy.0 = Debug|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Build.0 = Debug|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Deploy.0 = Debug|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.ActiveCfg = Debug|x64 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Build.0 = Debug|x64 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Deploy.0 = Debug|x64 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.ActiveCfg = Release|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Build.0 = Release|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Deploy.0 = Release|ARM + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.ActiveCfg = Release|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Build.0 = Release|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Deploy.0 = Release|Win32 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.ActiveCfg = Release|x64 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Build.0 = Release|x64 + {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Deploy.0 = Release|x64 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|ARM.ActiveCfg = Debug|ARM + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|ARM.Build.0 = Debug|ARM + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|Win32.Build.0 = Debug|Win32 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|x64.ActiveCfg = Debug|x64 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|x64.Build.0 = Debug|x64 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|ARM.ActiveCfg = Release|ARM + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|ARM.Build.0 = Release|ARM + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|Win32.ActiveCfg = Release|Win32 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|Win32.Build.0 = Release|Win32 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|x64.ActiveCfg = Release|x64 + {3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|x64.Build.0 = Release|x64 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|ARM.ActiveCfg = Debug|ARM + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|ARM.Build.0 = Debug|ARM + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|Win32.Build.0 = Debug|Win32 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|x64.ActiveCfg = Debug|x64 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|x64.Build.0 = Debug|x64 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|ARM.ActiveCfg = Release|ARM + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|ARM.Build.0 = Release|ARM + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.ActiveCfg = Release|Win32 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.Build.0 = Release|Win32 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.ActiveCfg = Release|x64 + {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {29321038-F308-421E-B8CA-140BB23D3C6D} + {7CA66464-6A5E-493B-82EF-DBD84F91766F} = {ECA7A2AA-8501-4177-8360-322A569B6C3E} + {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} = {ECA7A2AA-8501-4177-8360-322A569B6C3E} + {4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {7CA66464-6A5E-493B-82EF-DBD84F91766F} + {3B26A12D-3A44-47EA-82D2-282660FC844D} = {7CA66464-6A5E-493B-82EF-DBD84F91766F} + {ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} + {F3550FE0-C795-44F6-8FEB-093EB68143AE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} + EndGlobalSection +EndGlobal diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj new file mode 100644 index 0000000000..8d18b52516 --- /dev/null +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj @@ -0,0 +1,641 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM + + + Release + ARM + + + + {4f6def20-ac4c-487f-85b8-5993519e3911} + Cocos2dShaderCompiler + en-US + 12.0 + true + Windows Store + 8.1 + + + + Application + true + v120 + + + Application + true + v120 + + + Application + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cocos2dShaderCompiler_TemporaryKey.pfx + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store;$(VCInstallDir)\lib + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 + + + pch.h + $(IntDir)pch.pch + $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + App.xaml + + + DirectXPage.xaml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + false + false + false + false + + + + + + + + + false + false + false + false + false + false + + + App.xaml + + + DirectXPage.xaml + + + + + + Designer + + + + + + + Designer + + + Designer + + + + + + + + + \ No newline at end of file diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters new file mode 100644 index 0000000000..e428ea0402 --- /dev/null +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters @@ -0,0 +1,1173 @@ + + + + + 5a7dfab3-eb13-41b4-a863-3136f23cdca2 + bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png + + + Assets + + + Assets + + + Assets + + + Assets + + + {fa658c36-371d-4ebc-9363-0fc5634a68b0} + + + {baf5d4e6-b9ed-4dd6-82f9-eeb0f9f27c6d} + + + {1a9522f4-2248-4d5e-9f27-aa8f434b02c6} + + + {1f833f8d-6c08-4b5f-aeae-87b0fd414f3c} + + + {28e237bc-5de4-4afc-b8bf-0543ce767a5e} + + + {cf7e2c01-1ee8-4740-9dbc-f4623dc85a23} + + + {4dc6e8b1-25b2-4e5d-b83a-ea0b47fe88bd} + + + {ab492f52-b0fc-4055-8eb3-e5aff7734ced} + + + {115c74d1-3108-476d-a3e5-5089c8027d73} + + + {664900af-2f27-4622-886e-05cee5cbd0bc} + + + {6190d648-787d-49a2-89da-abaa820c0ef0} + + + {78d5964f-0893-428d-b4bb-93636e6d8744} + + + {bc3d9640-e48b-4e53-8725-38d900c9a019} + + + {e33e50a3-b742-4f4f-ae01-b233f27764c2} + + + + + + + + + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\platform + + + libcoco2d + + + libcoco2d\external\unzip + + + libcoco2d\external\unzip + + + libcoco2d\external\ConvertUTF + + + libcoco2d\external\ConvertUTF + + + libcoco2d\external\edtaa + + + libcoco2d\external\tinyxml2 + + + libcoco2d\external\xxhash + + + libcoco2d\platform + + + libcoco2d\platform + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\external\unzip + + + + + + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\base + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\2d + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\math + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\renderer + + + libcoco2d\platform + + + libcoco2d\external\unzip + + + libcoco2d\external\unzip + + + libcoco2d\external\ConvertUTF + + + libcoco2d\external\edtaa + + + libcoco2d\external\tinyxml2 + + + libcoco2d\external\xxhash + + + libcoco2d\platform + + + libcoco2d\platform + + + libcoco2d\platform\winrt + + + libcoco2d\platform\winrt + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\deprecated + + + libcoco2d\platform\winrt + + + libcoco2d\external\unzip + + + + + + + + + + + libcoco2d\math + + + + + + \ No newline at end of file diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx rename to build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx diff --git a/build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml b/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml rename to build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml diff --git a/build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.cpp b/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.cpp similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.cpp rename to build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.cpp diff --git a/build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.h b/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.h similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.h rename to build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.h diff --git a/build/winrt/Cocos2dShaderCompiler/Package.appxmanifest b/build/wp8/Cocos2dShaderCompiler/Package.appxmanifest similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/Package.appxmanifest rename to build/wp8/Cocos2dShaderCompiler/Package.appxmanifest diff --git a/build/winrt/Cocos2dShaderCompiler/ShaderCompiler.cpp b/build/wp8/Cocos2dShaderCompiler/ShaderCompiler.cpp similarity index 94% rename from build/winrt/Cocos2dShaderCompiler/ShaderCompiler.cpp rename to build/wp8/Cocos2dShaderCompiler/ShaderCompiler.cpp index cb0a8359ab..d8c1d9a538 100644 --- a/build/winrt/Cocos2dShaderCompiler/ShaderCompiler.cpp +++ b/build/wp8/Cocos2dShaderCompiler/ShaderCompiler.cpp @@ -51,21 +51,6 @@ ShaderCompiler::~ShaderCompiler() } -bool ShaderCompiler::applicationDidFinishLaunching() -{ - return true; -} - -void ShaderCompiler::applicationDidEnterBackground() -{ - -} - -void ShaderCompiler::applicationWillEnterForeground() -{ - - -} bool ShaderCompiler::Compile(Windows::UI::Xaml::Controls::TextBlock^ resultText) @@ -79,7 +64,9 @@ bool ShaderCompiler::Compile(Windows::UI::Xaml::Controls::TextBlock^ resultText) return false; } - Director::getInstance()->setAnimationInterval(1.0 / 60.0); + auto director = cocos2d::Director::getInstance(); + + //Director::getInstance()->setAnimationInterval(1.0 / 60.0); CCShaderCache::getInstance()->loadDefaultShaders(); CCPrecompiledShaders::getInstance()->savePrecompiledShaders(); resultText->Text = "Complete"; diff --git a/build/winrt/Cocos2dShaderCompiler/ShaderCompiler.h b/build/wp8/Cocos2dShaderCompiler/ShaderCompiler.h similarity index 88% rename from build/winrt/Cocos2dShaderCompiler/ShaderCompiler.h rename to build/wp8/Cocos2dShaderCompiler/ShaderCompiler.h index 46fd036fa5..c26cc5ee7a 100644 --- a/build/winrt/Cocos2dShaderCompiler/ShaderCompiler.h +++ b/build/wp8/Cocos2dShaderCompiler/ShaderCompiler.h @@ -24,11 +24,10 @@ THE SOFTWARE. ****************************************************************************/ #pragma once -#include "cocos2d.h" #include "CCGL.h" -class ShaderCompiler : private cocos2d::Application +class ShaderCompiler { public: @@ -40,9 +39,6 @@ private: Windows::UI::Xaml::Controls::TextBlock^ m_resultText; - virtual bool applicationDidFinishLaunching(); - virtual void applicationDidEnterBackground(); - virtual void applicationWillEnterForeground(); void InitializeCocos2d(); diff --git a/build/winrt/Cocos2dShaderCompiler/pch.cpp b/build/wp8/Cocos2dShaderCompiler/pch.cpp similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/pch.cpp rename to build/wp8/Cocos2dShaderCompiler/pch.cpp diff --git a/build/winrt/Cocos2dShaderCompiler/pch.h b/build/wp8/Cocos2dShaderCompiler/pch.h similarity index 100% rename from build/winrt/Cocos2dShaderCompiler/pch.h rename to build/wp8/Cocos2dShaderCompiler/pch.h diff --git a/build/wp8/wp8_precompiled_shaders.txt b/build/wp8/wp8_precompiled_shaders.txt new file mode 100644 index 0000000000..ca3deaf2c0 --- /dev/null +++ b/build/wp8/wp8_precompiled_shaders.txt @@ -0,0 +1,7 @@ +How to compile precompiled shaders for Windows Phone 8.0 (WP8) + +1. Open the VS project Cocos2dShaderCompiler\Cocos2dShaderCompiler.sln +2. Build and run the project +3. Click the Compile button +4. Select the file cocos\platform\wp8\shaders\precompiledshaders.h in the file dialog box +5. Program will precompile all of the cached cocos2d-x shaders. \ No newline at end of file diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index e758fe0d70..b451526062 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -1100,6 +1100,7 @@ void Node::removeAllChildren() this->removeAllChildrenWithCleanup(true); } +#if CC_USE_PHYSICS void Node::removeFromPhysicsWorld() { if (_physicsBody != nullptr) @@ -1112,6 +1113,7 @@ void Node::removeFromPhysicsWorld() child->removeFromPhysicsWorld(); } } +#endif void Node::removeAllChildrenWithCleanup(bool cleanup) { diff --git a/cocos/2d/cocos2d_winrt.props b/cocos/2d/cocos2d_winrt.props deleted file mode 100644 index edd7aab524..0000000000 --- a/cocos/2d/cocos2d_winrt.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\..\ - - - - - _VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - true - false - OldStyle - 4056;4996;4244; - - - /IGNORE:4264 %(AdditionalOptions) - - - - - $(EngineRoot) - true - - - \ No newline at end of file diff --git a/cocos/2d/cocos2d_winrt.vcxproj b/cocos/2d/cocos2d_winrt.vcxproj deleted file mode 100644 index 00d7f67216..0000000000 --- a/cocos/2d/cocos2d_winrt.vcxproj +++ /dev/null @@ -1,759 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {2330EDF4-5596-4B53-8BA5-158DDDE713D9} - Win32Proj - libcocos2d - cocos2d-x.win32 - en-US - 12.0 - true - Windows Store - 8.1 - - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - false - true - v120 - - - StaticLibrary - false - true - v120 - - - StaticLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - false - $(SolutionDir)\winrt$(Configuration)\$(MSBuildProjectName)\ - winrt\$(Configuration)\ - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - -Zm110 %(AdditionalOptions) - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;libchipmunk.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\chipmunk\prebuilt\wp8\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;libchipmunk.lib;%(AdditionalDependencies) - - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies) - - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies) - - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies) - - - - - Use - true - true - $(EngineRoot)external;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) - WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4267;4251;4244;4996;%(DisableSpecificWarnings) - pch.h - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies) - - - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - true - true - true - true - true - true - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - true - true - true - true - true - true - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/2d/cocos2d_winrt.vcxproj.filters b/cocos/2d/cocos2d_winrt.vcxproj.filters deleted file mode 100644 index f486f2c14a..0000000000 --- a/cocos/2d/cocos2d_winrt.vcxproj.filters +++ /dev/null @@ -1,1356 +0,0 @@ - - - - - {926fc31c-8742-4984-9940-c972dd02fc8a} - - - {66fe0560-cca4-4b0c-a192-44aca8ad82af} - - - {d3c53fc9-8678-4801-9a24-a619be0e761e} - - - {929b5dfc-73f5-4094-9036-051078571248} - - - {c883205c-736d-46a1-8626-8307d7c1967b} - - - {ff74d35d-9d65-44b8-8569-36197c006c41} - - - {8e9c8baf-8264-4016-bc90-ed547dfb524d} - - - {6063a842-a931-44fe-aea7-605af02302a4} - - - {ebd488cd-3f7b-4d28-adfc-e70980a65199} - - - {b31e69bf-1430-4938-81a4-b88019ba6f70} - - - {364e5ee6-3dee-4d24-baee-a59dd3519e8b} - - - {7532fb96-9b65-44e6-a165-b78eb67e14e2} - - - {bb9fdcc1-d324-4e79-9d10-8698b0ea583d} - - - {7ca64aa2-f350-4bc9-a046-d24c4df4f0ad} - - - {261eb0ec-d921-49ec-8ccd-f528d5a91abd} - - - {bb14c2af-576d-4274-a21e-c518397fa0cf} - - - {4626742b-b8a8-4626-ac6c-17be46e1c3c1} - - - - - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform - - - platform - - - platform - - - platform - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 3d - - - 3d - - - 3d - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - external\ConvertUTF - - - external\ConvertUTF - - - external\edtaa - - - external\tinyxml2 - - - external\unzip - - - external\unzip - - - external\unzip - - - external\xxhash - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics - - - physics - - - physics - - - physics - - - physics - - - platform - - - platform\winrt - - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - base - - - - - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 3d - - - 3d - - - 3d - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - external\ConvertUTF - - - external\edtaa - - - external\tinyxml2 - - - external\unzip - - - external\unzip - - - external\unzip - - - external\xxhash - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics - - - physics - - - physics - - - physics - - - physics - - - platform - - - platform\winrt - - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - - - platform - - - platform - - - platform - - - platform - - - platform - - - renderer - - - base - - - - - base - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - \ No newline at end of file diff --git a/cocos/2d/cocos2d_winrt_headers.props b/cocos/2d/cocos2d_winrt_headers.props deleted file mode 100644 index fd510616e4..0000000000 --- a/cocos/2d/cocos2d_winrt_headers.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\..\ - - - - - $(EngineRoot)cocos;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF; - - - - - $(EngineRoot) - true - - - \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters deleted file mode 100644 index b670c0eeb1..0000000000 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ /dev/null @@ -1,1583 +0,0 @@ - - - - - {926fc31c-8742-4984-9940-c972dd02fc8a} - - - {08593631-5bf5-46aa-9436-62595c4f7bf6} - - - {aeadfa95-9c89-4212-98ae-89ad57db596a} - - - {cba0f362-878c-438b-ad0f-43d287516357} - - - {d7ac4e48-57dd-4b9e-95de-2a973b22b1ce} - - - {14e6de7a-f7ef-4249-9141-abf17033d9c2} - - - {5598fb0c-c012-45b6-8e43-447e7891b61d} - - - {f3673af7-9bbd-463b-a3a9-a081e67248d8} - - - {fbaf3e74-09dc-4f89-9d5a-0e7ccabbfbff} - - - {41c1aef6-86c9-42e3-b68c-6da3107ff587} - - - {a03a9ca0-013a-4082-bb45-43f024ff0f4e} - - - {0e7c99cb-0b41-4120-9773-49c31345d829} - - - {729473cd-a9e2-4133-b78e-37a6c3687550} - - - {54949861-d861-4eea-89bf-0498ef3c338c} - - - {64846670-6658-45f9-84cf-29e013870c37} - - - {026f880b-7918-49f8-8f0d-00f7593ce326} - - - {a36c6808-a8d6-43f4-bfb0-e08ee2747a21} - - - {fdee8fd3-05f9-46a1-aa15-6ceb16358145} - - - {85e8e428-d95d-4ca2-9765-c27ce7571bc4} - - - {f57aa1db-2f62-429c-bdf2-c772da13b9fe} - - - {f8d8f14c-cf4b-41a4-8948-6abdb29edcad} - - - - - physics - - - physics - - - physics - - - physics - - - physics - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - external\xxhash - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - - external\ConvertUTF - - - external\ConvertUTF - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - external\tinyxml2 - - - external\unzip - - - external\unzip - - - external\unzip - - - external\edtaa - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - platform - - - platform - - - platform - - - platform - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - base - - - 3d - - - 3d - - - 3d - - - renderer - - - - base - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 2d - - - 2d - - - platform - - - 2d - - - base - - - 3d - - - 3d - - - base - - - renderer - - - renderer - - - renderer - - - renderer - - - base - - - 3d - - - 3d - - - 3d - - - renderer - - - 3d - - - platform\wp8 - - - 3d - - - base - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - - - physics - - - physics - - - physics - - - physics - - - physics - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - physics\chipmunk - - - external\xxhash - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - deprecated - - - external\ConvertUTF - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - 2d - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - external\tinyxml2 - - - external\unzip - - - external\unzip - - - external\unzip - - - external\edtaa - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - base - - - base - - - 3d - - - 3d - - - 3d - - - renderer - - - - base - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 2d - - - 2d - - - platform - - - 2d - - - base - - - 3d - - - 3d - - - base - - - renderer - - - renderer - - - renderer - - - renderer - - - base - - - 3d - - - 3d - - - 3d - - - renderer - - - 3d - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform\wp8 - - - 3d - - - base - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\io - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite\stubs - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - external\protobuf-lite - - - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8_headers.props b/cocos/2d/cocos2d_wp8_headers.props deleted file mode 100644 index b5f55539b7..0000000000 --- a/cocos/2d/cocos2d_wp8_headers.props +++ /dev/null @@ -1,28 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\..\ - - - - - $(EngineRoot)cocos\platform;$(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\wp8-specific\zlib\include;$(GeneratedFilesDir) - _VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - false - OldStyle - 4056;4996; - - - /IGNORE:4264 %(AdditionalOptions) - - - - - $(EngineRoot) - true - - - \ No newline at end of file diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln new file mode 100644 index 0000000000..643e0e020e --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln @@ -0,0 +1,60 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d_8_1", "libcocos2d_8_1", "{CA9DBD4B-603D-494E-802A-1C36E3EA3F07}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Windows", "libcocos2d_8_1\libcocos2d_8_1.Windows\libcocos2d_8_1.Windows.vcxproj", "{9335005F-678E-4E8E-9B84-50037216AEC8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.WindowsPhone", "libcocos2d_8_1\libcocos2d_8_1.WindowsPhone\libcocos2d_8_1.WindowsPhone.vcxproj", "{22F3B9DF-1209-4574-8331-003966F562BF}" +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4 + libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9 + libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.ActiveCfg = Debug|ARM + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.Build.0 = Debug|ARM + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.ActiveCfg = Debug|Win32 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.Build.0 = Debug|Win32 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.ActiveCfg = Debug|x64 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.Build.0 = Debug|x64 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.ActiveCfg = Release|ARM + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.Build.0 = Release|ARM + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.ActiveCfg = Release|Win32 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.Build.0 = Release|Win32 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.ActiveCfg = Release|x64 + {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.Build.0 = Release|x64 + {22F3B9DF-1209-4574-8331-003966F562BF}.Debug|ARM.ActiveCfg = Debug|ARM + {22F3B9DF-1209-4574-8331-003966F562BF}.Debug|ARM.Build.0 = Debug|ARM + {22F3B9DF-1209-4574-8331-003966F562BF}.Debug|Win32.ActiveCfg = Debug|Win32 + {22F3B9DF-1209-4574-8331-003966F562BF}.Debug|Win32.Build.0 = Debug|Win32 + {22F3B9DF-1209-4574-8331-003966F562BF}.Debug|x64.ActiveCfg = Debug|Win32 + {22F3B9DF-1209-4574-8331-003966F562BF}.Release|ARM.ActiveCfg = Release|ARM + {22F3B9DF-1209-4574-8331-003966F562BF}.Release|ARM.Build.0 = Release|ARM + {22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.ActiveCfg = Release|Win32 + {22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.Build.0 = Release|Win32 + {22F3B9DF-1209-4574-8331-003966F562BF}.Release|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {CA9DBD4B-603D-494E-802A-1C36E3EA3F07} + {9335005F-678E-4E8E-9B84-50037216AEC8} = {CA9DBD4B-603D-494E-802A-1C36E3EA3F07} + {22F3B9DF-1209-4574-8331-003966F562BF} = {CA9DBD4B-603D-494E-802A-1C36E3EA3F07} + EndGlobalSection +EndGlobal diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems new file mode 100644 index 0000000000..eaca2f6dfd --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems @@ -0,0 +1,813 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {5d6f020f-7e72-4494-90a0-2df11d235df9} + libcocos2d_8_1 + libcocos2d_8_1.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + + + + + + + + + CompileAsCpp + + + + + + + + + + + + + + + + + + + NotUsing + + + + + NotUsing + + + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + CompileAsCpp + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters new file mode 100644 index 0000000000..2d533c5860 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters @@ -0,0 +1,2489 @@ + + + + + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + external\ConvertUTF + + + external\edtaa + + + external\xxhash + + + external\unzip + + + external\unzip + + + external\tinyxml2 + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics + + + physics + + + physics + + + physics + + + physics + + + cocostudio + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\armature + + + cocostudio\armature + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\datas + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\physics + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\json\rapidjson\internal + + + cocostudio\json\rapidjson\internal + + + cocostudio\json\rapidjson\internal + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\reader\WidgetReader\ButtonReader + + + cocostudio\reader\WidgetReader\CheckBoxReader + + + cocostudio\reader\WidgetReader\ImageViewReader + + + cocostudio\reader\WidgetReader\LayoutReader + + + cocostudio\reader\WidgetReader\ListViewReader + + + cocostudio\reader\WidgetReader\LoadingBarReader + + + cocostudio\reader\WidgetReader\PageViewReader + + + cocostudio\reader\WidgetReader\ScrollViewReader + + + cocostudio\reader\WidgetReader\SliderReader + + + cocostudio\reader\WidgetReader\TextAtlasReader + + + cocostudio\reader\WidgetReader\TextBMFontReader + + + cocostudio\reader\WidgetReader\TextFieldReader + + + cocostudio\reader\WidgetReader\TextReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + storage + + + ui\BaseClasses + + + ui\BaseClasses + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\System + + + ui\System + + + ui\System + + + ui\System + + + ui\UIWidgets\EditBox + + + ui\UIWidgets\EditBox + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + extension\AssetsManager + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\physics_nodes + + + extension\physics_nodes + + + extension + + + extension + + + extension + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + + cocostudio\json + + + cocostudio\json + + + cocostudio\json + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\trigger + + + cocosdenshion\Header Files + + + cocosdenshion\Header Files + + + cocosdenshion\Header Files + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocostudio\reader + + + cocostudio\reader + + + ui\UIWidgets + + + base + + + platform\winrt + + + platform\winrt + + + platform + + + platform\winrt + + + external\unzip + + + + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + external\ConvertUTF + + + external\ConvertUTF + + + external\edtaa + + + external\xxhash + + + external\unzip + + + external\unzip + + + external\tinyxml2 + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics + + + physics + + + physics + + + physics + + + physics + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\armature + + + cocostudio\armature + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\datas + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\physics + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\reader\WidgetReader\ButtonReader + + + cocostudio\reader\WidgetReader\CheckBoxReader + + + cocostudio\reader\WidgetReader\ImageViewReader + + + cocostudio\reader\WidgetReader\LayoutReader + + + cocostudio\reader\WidgetReader\ListViewReader + + + cocostudio\reader\WidgetReader\LoadingBarReader + + + cocostudio\reader\WidgetReader\PageViewReader + + + cocostudio\reader\WidgetReader\ScrollViewReader + + + cocostudio\reader\WidgetReader\SliderReader + + + cocostudio\reader\WidgetReader\TextAtlasReader + + + cocostudio\reader\WidgetReader\TextBMFontReader + + + cocostudio\reader\WidgetReader\TextFieldReader + + + cocostudio\reader\WidgetReader\TextReader + + + cocostudio\reader\WidgetReader + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + storage + + + ui\BaseClasses + + + ui\BaseClasses + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\System + + + ui\System + + + ui\System + + + ui\UIWidgets\EditBox + + + ui\UIWidgets\EditBox + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + extension\AssetsManager + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCControlExtensions + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\physics_nodes + + + extension\physics_nodes + + + network\Source Files + + + network\Source Files + + + network\Source Files + + + platform + + + platform + + + platform + + + platform + + + platform + + + + cocostudio\json + + + cocostudio\json + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\trigger + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocostudio\reader + + + cocostudio\reader + + + ui\UIWidgets + + + base + + + platform\winrt + + + platform + + + platform\winrt + + + external\unzip + + + + + {5dce13cf-2a33-4a9d-bea1-1cf6228f6323} + + + {d1405feb-dfdf-4ddf-9513-6b22179dcd07} + + + {47ffb3d6-a40e-475a-8018-eb9b04ece90a} + + + {6b35b27f-9d44-4f64-a602-28da1d6eb831} + + + {faf0ec2a-d245-4aa1-aade-91c36141ae81} + + + {042742fb-0fcf-4bef-aa7e-ede8b84febae} + + + {cd078356-9cc6-46c2-8d39-dc702c994139} + + + {99e5454f-55e7-4a86-bf56-823dc80f02cd} + + + {650a2fa5-095e-4d93-86d6-5b38663c2dcf} + + + {862c9f7f-fb24-4ab3-9713-76eed9341c50} + + + {6341b1da-4cfa-4ce5-a824-9f4ae73fb26c} + + + {7cf18e6c-00a8-4938-8f37-f899df2d4a78} + + + {9355ad31-9678-4680-8d7d-21864e11663a} + + + {93a234af-ace5-4391-ba94-906f9d8b1ac8} + + + {90707a94-17e0-4a22-9871-ea02fa83b1d3} + + + {1aa91433-3e54-4b8d-adff-7f7ecae29867} + + + {d0b36fd3-ca94-4b7d-828b-0cbf964bd9e9} + + + {5367d407-978c-4535-aa47-65a659dcc490} + + + {3ab7ab3b-98c2-428e-8715-df40a5f8deca} + + + {becaa915-a665-4657-8aae-722c99ae368b} + + + {0b41a5be-2392-4079-b980-14c701c7e349} + + + {c2fddcbf-b255-4fb6-8f55-9ca85bd3809b} + + + {9a5d5bc4-80f9-42aa-8865-c79711dfa7d6} + + + {97dd34cb-0d69-4ecd-bbf6-976cdf236d60} + + + {7345e280-b8a5-4d89-a27c-60cf351952d2} + + + {e31070b5-5b5f-47d4-b5c5-72220fe506de} + + + {26df0f77-db9e-4895-b648-118e42b24728} + + + {506718ba-bcdf-4078-9c11-781089c8d9f5} + + + {45d1e3fe-f2de-457b-bc91-0d60cbc50d8f} + + + {c7545a66-40fe-43af-ac7b-cce94a5bde56} + + + {90a35e19-a318-4dd8-96e0-42112c4de943} + + + {d2f2d731-a0fc-4fca-916a-ce87b5fb5cab} + + + {7d85e693-c5fb-4408-abe0-f9ff7df0e384} + + + {a9af9e6f-0fd3-4461-9b3a-2de2417624eb} + + + {43ca9fc2-569b-4753-9150-ac5bfc6f543e} + + + {7dfddab5-351a-48e7-9cd4-1df5268badfd} + + + {7225fe7b-80b7-40a8-a674-435183a8c45a} + + + {cc361288-af78-4806-939c-538c560996f0} + + + {c88afb13-dccb-4ff6-be05-fd91f19d9202} + + + {49a50e7b-bf26-480e-a4e6-25b19fc4a312} + + + {6559bb9c-34ce-4702-a0c7-cb3e93a22caf} + + + {37576c88-e687-4089-a758-6ef970087d3d} + + + {dd2338c9-660d-4131-aaf6-3c3cc30dfbe8} + + + {16ad21b8-70cc-4ab6-8ec6-e84417a685e7} + + + {1647ffda-45c0-401d-a050-0217bc5c3b91} + + + {99d20297-341e-4d4f-ac32-bf0f957bb08e} + + + {0f1c084d-aee7-4f97-a65f-a40a0b28ff16} + + + {5c9190b3-70ea-4189-b42a-442399baf629} + + + {c81f1e50-d504-432b-9e38-92d015c88f8f} + + + {f2018778-20b3-439e-9127-4080d18448db} + + + {ffc571d4-dca4-4cf0-b62c-f35b5f26f204} + + + {c03ed815-ce08-4801-bdd6-1869ff3c014e} + + + {48ae1ce9-b81f-479f-b59c-b10e344699d8} + + + {1a7fb736-f3df-4683-b892-b181bc26fb0d} + + + {ef54a6b1-dfbe-4808-86a2-8ba0664b15ad} + + + {4f239b1b-f1ca-472c-acb9-d84fbb0aeb9d} + + + {39f7141f-d8ce-4780-b9ee-c0c8e5410dc8} + + + {b8bf48f3-8e10-4010-ae69-367715f2755a} + + + {03cfe246-9a82-45ed-8a0f-f5e7baa91e0d} + + + {9a84f2c8-f6bb-4c38-9669-b1c6e45ef658} + + + {b24283d8-3e1c-4fbe-b632-fef2cef51d87} + + + {161033d2-1f07-477f-a694-c664c942f102} + + + {840515bd-a764-47a1-b1d1-ad4d9fdbde91} + + + {1d8b1ab3-9e58-4b9d-a5d4-91ac54f29a44} + + + {09977165-cfcf-4101-9b00-6a3dc5397aaf} + + + {f8d3d5c4-e469-4980-bf28-aa7f6dac53a1} + + + {354b91cc-c6f7-4a7e-bd72-737916af7e23} + + + {5f37f118-5902-4683-9243-fcc77bdbf3e1} + + + + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + \ No newline at end of file diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/targetver.h b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/targetver.h new file mode 100644 index 0000000000..a66ecb00f1 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj new file mode 100644 index 0000000000..d7757a5871 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj @@ -0,0 +1,254 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + {3b26a12d-3a44-47ea-82d2-282660fc844d} + + + {f3550fe0-c795-44f6-8feb-093eb68143ae} + + + + {9335005f-678e-4e8e-9b84-50037216aec8} + en-US + 12.0 + true + Windows Store + 8.1 + CodeSharingDll + + + + DynamicLibrary + true + v120 + + + DynamicLibrary + true + v120 + + + DynamicLibrary + true + v120 + + + DynamicLibrary + false + true + v120 + + + DynamicLibrary + false + true + v120 + + + DynamicLibrary + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + false + false + libcocos2d_v3.3_Windows_8.1 + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + + \ No newline at end of file diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj.filters new file mode 100644 index 0000000000..a7761ab018 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj new file mode 100644 index 0000000000..7ac3603d83 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj @@ -0,0 +1,180 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + + + {22f798d8-bfff-4754-996f-a5395343d5ec} + + + {cc1da216-a80d-4be4-b309-acb6af313aff} + + + + {22f3b9df-1209-4574-8331-003966f562bf} + libcocos2d_8_1 + en-US + 12.0 + true + Windows Phone + 8.1 + CodeSharingDll + + + + DynamicLibrary + true + v120_wp81 + + + DynamicLibrary + true + v120_wp81 + + + DynamicLibrary + false + true + v120_wp81 + + + DynamicLibrary + false + true + v120_wp81 + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + libcocos2d_v3.3_WindowsPhone_8.1 + + + false + false + libcocos2d_v3.3_WindowsPhone_8.1 + + + false + false + libcocos2d_v3.3_WindowsPhone_8.1 + + + false + false + libcocos2d_v3.3_WindowsPhone_8.1 + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + Use + true + /Zm200 %(AdditionalOptions) + pch.h + $(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;%(AdditionalIncludeDirectories) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + + + Console + false + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + ..\..\..\cocos2d.def + + + + + + \ No newline at end of file diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj.filters new file mode 100644 index 0000000000..a7761ab018 --- /dev/null +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj similarity index 55% rename from cocos/2d/cocos2d_wp8.vcxproj rename to cocos/2d/libcocos2d_wp8.vcxproj index 2e40199da9..130d4edc15 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,445 +19,190 @@ - {B5AF91B3-64EA-44E1-84B0-D759E93758FB} - cocos2d-x.win32 + {7c5dbc42-27f6-4978-aabc-02ba77e2a7f0} + libcocos2d_wp8 en-US 11.0 - libcocos2d - StaticLibrary + DynamicLibrary true v110_wp80 + false - StaticLibrary + DynamicLibrary true v110_wp80 + false - StaticLibrary + DynamicLibrary false true v110_wp80 + false - StaticLibrary + DynamicLibrary false true v110_wp80 + false - - + - - + - - + - - + false + + libcocos2d_v3.3_WindowsPhone_8.0 + false + + + libcocos2d_v3.3_WindowsPhone_8.0 + false + + + libcocos2d_v3.3_WindowsPhone_8.0 + + + libcocos2d_v3.3_WindowsPhone_8.0 + - %(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) Use pch.h + true $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) + $(EngineRoot)external\jpeg\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\tiff\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\png\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) + /Zm256 %(AdditionalOptions) pch.h - /Zm200 %(AdditionalOptions) Console false - ole32.lib; - d3d11.lib;xaudio2.lib;libEGL_phone.lib;libGLESv2_phone.lib;freetype.lib;libpng.lib;libjpeg.lib;libtiff.lib;zlib.lib;%(AdditionalDependencies) - ..\..\external\wp8-specific\angle\prebuilt\$(Platform);..\..\external\wp8-specific\zlib\prebuilt\$(Platform);..\..\external\png\prebuilt\wp8\$(Platform);..\..\external\jpeg\prebuilt\wp8\$(Platform);..\..\external\tiff\prebuilt\wp8\$(Platform);..\..\external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - - - /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;ws2_32.lib;libchipmunk.lib;%(AdditionalDependencies) + false + true + ole32.lib $(EngineRoot)external\wp8-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\wp8\$(Platform);$(EngineRoot)external\jpeg\prebuilt\wp8\$(Platform);$(EngineRoot)external\tiff\prebuilt\wp8\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(EngineRoot)external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - + cocos2d.def + - _LIB;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h + true $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) + $(EngineRoot)external\jpeg\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\tiff\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\png\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) + /Zm256 %(AdditionalOptions) pch.h - /Zm200 %(AdditionalOptions) Console false - ole32.lib; - d3d11.lib;xaudio2.lib;libEGL_phone.lib;libGLESv2_phone.lib;freetype.lib;libpng.lib;libjpeg.lib;libtiff.lib;zlib.lib;%(AdditionalDependencies) - ..\..\external\wp8-specific\angle\prebuilt\$(Platform);..\..\external\wp8-specific\zlib\prebuilt\$(Platform);..\..\external\png\prebuilt\wp8\$(Platform);..\..\external\jpeg\prebuilt\wp8\$(Platform);..\..\external\tiff\prebuilt\wp8\$(Platform);..\..\external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - - - /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;ws2_32.lib;libchipmunk.lib;%(AdditionalDependencies) + false + true + ole32.lib $(EngineRoot)external\wp8-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\wp8\$(Platform);$(EngineRoot)external\jpeg\prebuilt\wp8\$(Platform);$(EngineRoot)external\tiff\prebuilt\wp8\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(EngineRoot)external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - + cocos2d.def + - _LIB;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) Use pch.h + true $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) + $(EngineRoot)external\jpeg\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\tiff\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\png\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) + /Zm256 %(AdditionalOptions) pch.h - /Zm200 %(AdditionalOptions) - CompileAsCpp Console false - ole32.lib; - d3d11.lib;xaudio2.lib;libEGL_phone.lib;libGLESv2_phone.lib;freetype.lib;libpng.lib;libjpeg.lib;libtiff.lib;zlib.lib;%(AdditionalDependencies) - ..\..\external\wp8-specific\angle\prebuilt\$(Platform);..\..\external\wp8-specific\zlib\prebuilt\$(Platform);..\..\external\png\prebuilt\wp8\$(Platform);..\..\external\jpeg\prebuilt\wp8\$(Platform);..\..\external\tiff\prebuilt\wp8\$(Platform);..\..\external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - - - /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;ws2_32.lib;libchipmunk.lib;%(AdditionalDependencies) + false + true + ole32.lib $(EngineRoot)external\wp8-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\wp8\$(Platform);$(EngineRoot)external\jpeg\prebuilt\wp8\$(Platform);$(EngineRoot)external\tiff\prebuilt\wp8\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(EngineRoot)external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - + cocos2d.def + - _LIB;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h + true $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) + $(EngineRoot)external\jpeg\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\tiff\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\png\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) + /Zm256 %(AdditionalOptions) pch.h - /Zm200 %(AdditionalOptions) - CompileAsCpp Console false - ole32.lib; - d3d11.lib;xaudio2.lib;libEGL_phone.lib;libGLESv2_phone.lib;freetype.lib;libpng.lib;libjpeg.lib;libtiff.lib;zlib.lib;%(AdditionalDependencies) - ..\..\external\wp8-specific\angle\prebuilt\$(Platform);..\..\external\wp8-specific\zlib\prebuilt\$(Platform);..\..\external\png\prebuilt\wp8\$(Platform);..\..\external\jpeg\prebuilt\wp8\$(Platform);..\..\external\tiff\prebuilt\wp8\$(Platform);..\..\external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - - - /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;ws2_32.lib;libchipmunk.lib;%(AdditionalDependencies) + false + true + ole32.lib $(EngineRoot)external\wp8-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\wp8\$(Platform);$(EngineRoot)external\jpeg\prebuilt\wp8\$(Platform);$(EngineRoot)external\tiff\prebuilt\wp8\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(EngineRoot)external\freetype2\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) - + cocos2d.def + - - true - - - true - false - - - - - - - - - true - true - true - true - NotUsing - NotUsing - NotUsing - NotUsing - CompileAsCpp - CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - false - - - NotUsing - CompileAsCpp - - - false - false - NotUsing - CompileAsCpp - - - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - false - - - - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + @@ -466,6 +211,14 @@ + + + + + + + + @@ -478,10 +231,9 @@ - - + @@ -502,6 +254,10 @@ + + + + @@ -569,6 +325,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -581,6 +422,11 @@ + + + + + @@ -611,7 +457,7 @@ - + @@ -620,11 +466,11 @@ + - @@ -647,6 +493,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -714,6 +588,467 @@ + + + + + + + + + + + + + + + + + + + + true + true + true + true + NotUsing + NotUsing + NotUsing + NotUsing + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + false + + @@ -745,4 +1080,16 @@ + + + {c55734a3-702c-4fa1-b950-32c8e169302f} + + + {7d4fc6eb-9497-4804-98f3-3eaedc896154} + + + + + + \ No newline at end of file diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters new file mode 100644 index 0000000000..36fda2ad7c --- /dev/null +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -0,0 +1,2619 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {7781bbd0-663f-497c-9d8b-8cbc7ea93999} + + + {72b2d0ea-8d6f-43a4-bc2f-5c11cdb95c5b} + + + {3a28d334-186f-401c-aadd-70b4e023db1e} + + + {03cc06c3-283f-46fb-9680-b5a84dfa57df} + + + {e8aa6119-28b7-4df6-ba01-9db968b1f002} + + + {d9999c21-df9a-4885-bda7-d267cdfbde01} + + + {ef4bc857-41ca-412e-89a0-b02cb401fdc7} + + + {35781717-7235-4f1f-9ae7-716e64ccc6b9} + + + {c7536592-2bd8-4a92-bcd0-8f8e21551eaa} + + + {9f40f0d1-83d9-42ce-a185-5f5756c90597} + + + {6c1981b2-d955-4fe6-b81d-3bc84eed0590} + + + {a7501f5e-4fef-4f37-a646-ffe633008d9b} + + + {12ce37e2-709d-416e-a592-1c60b33fd6ce} + + + {1850cae0-9e70-47af-87d5-c90f8343c06a} + + + {81ef00d8-d5b6-4aac-9670-fe4af22ecbe7} + + + {a2fd6c36-9078-45e7-bc11-c235357f565e} + + + {c52c9563-bc10-4b77-8bcc-0e061628fae7} + + + {1be811ab-a9b0-44f7-9a37-b7ef7f1ef24a} + + + {794d19d1-2992-497a-a770-081932fa9242} + + + {287bc50b-c080-40b5-b885-88ac1f1a617b} + + + {d6936bb0-d231-4ede-a33e-1de5c388fca0} + + + {e657ad42-e62c-4bb5-98bd-42deeb214458} + + + {e78ebf14-f840-478a-985a-26f33c8a7a7f} + + + {d6ade174-8a80-4a3b-805d-31b33f3bb12e} + + + {2da83f5a-eb55-4d14-831a-8a321ae76905} + + + {412bbcff-4dc5-4c37-a6d9-0216d6b87418} + + + {67dc1c20-1409-453b-8b1a-a22bd5af6176} + + + {4b45f82d-a5e2-4cfc-9b56-3dad70693c4a} + + + {954e3ba3-1bc6-4a7a-abe6-ca4a1e177099} + + + {f3fb753f-e47b-4af3-a59d-4e65fddd73fc} + + + {b5456a67-16de-41ea-844f-46ef481ecad9} + + + {15cef3b1-e1b4-40ad-b4bb-4f918396ccce} + + + {ab9c0e6c-fe51-42c6-89df-7962bf2cfeec} + + + {c26e58bf-de47-4895-bd07-4aa32ef93867} + + + {67812e0f-147f-4015-af72-6c878a9c4a06} + + + {b04a6ae6-7d66-4b83-88ed-1eea239c31d6} + + + {911eab6e-b192-4a3e-a80a-e7254477ac4b} + + + {45ec1342-efb4-480a-96e6-56d9167ddf2e} + + + {7c1387e5-341a-476c-a2af-f4629e7445b4} + + + {8610c729-6bfa-43f2-b954-1c8ad06b0b4f} + + + {1c203621-0357-429a-aae0-766c816b1bfd} + + + {60c2b17d-ed4d-44d9-b369-3421563e4369} + + + {89da718e-f2fa-4437-83e8-40755f6fc3a2} + + + {20e787a6-57c3-4122-88ad-d803c892e7f4} + + + {472edbc0-fbb6-41a4-8759-40c11a78b47c} + + + {77da5935-5a02-4f2b-82fa-d76be5533241} + + + {38b491dc-2676-4d85-a50c-da867dc22ba8} + + + {ae1c235a-fe3f-49b1-98d5-907391591301} + + + {b443b5e0-2fd5-439b-a9e6-ca4ad2520553} + + + {39217b15-d4cb-44b5-8636-47f6c8026a13} + + + {e48826ef-5e90-4d47-8829-06cf2f32d759} + + + {e8a7d029-142d-4e6e-a606-9b86b1539627} + + + {ead17956-8c02-427d-8558-0d4abcae53c7} + + + {a63a9a3e-bfe9-4ebd-82eb-d08ee689c2af} + + + {0a92e110-3c5e-4714-9616-a6f4c611d054} + + + {d8be569c-cf20-477a-8d2c-f177ecbb3098} + + + {3ef51a10-298c-43ff-99b0-04a7d9a16ad9} + + + {5c1d3bda-e73f-4267-b97d-9431edf0cb9b} + + + {e1d04fd8-3aaf-4744-b63c-ef284cea01e8} + + + {a9c25e42-8568-4b34-95c6-842d1c84cff1} + + + {b8343db5-7783-4ebe-934a-13d079f35c04} + + + {2cdbd301-d589-4a7b-bee5-f1e61359285b} + + + {9917270a-302d-4203-875b-abacc7d8313d} + + + {0e7cd115-2c97-4059-8ee0-6e0915eab1d2} + + + {14f51ffa-f405-4785-9eed-e6d059ab6886} + + + {02cd79b1-fdf9-459a-884d-cd584784f20c} + + + {ae5cf6f4-8676-4f48-a4c6-74fefd9f502a} + + + {a9981839-03f2-4d16-8170-db722dc0777f} + + + {f3a0416f-0c3a-44c2-a9f3-e59fab18e37f} + + + {398440fd-bc31-41ce-8ac1-03e943d0c761} + + + {e3dc7161-12e0-4d3b-b364-00de56fe3755} + + + {f68c00d5-e79f-4b3b-b352-20808e2b4f39} + + + {0037c6b3-aa22-4e63-9048-42ca6c88c9fb} + + + {4efe3422-d5e4-4dd9-8c5e-51a2333f554b} + + + {38e945e9-f3d8-44e5-8ef9-54ff95ab6f1e} + + + {2002113e-f002-4ce3-ad7e-3e8609c691d0} + + + {b7fdf4e2-b3be-4b7a-b586-ddab39fb05b7} + + + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + external\ConvertUTF + + + external\ConvertUTF + + + external\xxhash + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + physics + + + physics + + + physics + + + physics + + + physics + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform\wp8 + + + platform\wp8 + + + platform\wp8 + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\reader + + + cocostudio\reader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader\ButtonReader + + + cocostudio\reader\WidgetReader\CheckBoxReader + + + cocostudio\reader\WidgetReader\ImageViewReader + + + cocostudio\reader\WidgetReader\LayoutReader + + + cocostudio\reader\WidgetReader\ListViewReader + + + cocostudio\reader\WidgetReader\LoadingBarReader + + + cocostudio\reader\WidgetReader\PageViewReader + + + cocostudio\reader\WidgetReader\ScrollViewReader + + + cocostudio\reader\WidgetReader\SliderReader + + + cocostudio\reader\WidgetReader\TextAtlasReader + + + cocostudio\reader\WidgetReader\TextBMFontReader + + + cocostudio\reader\WidgetReader\TextFieldReader + + + cocostudio\reader\WidgetReader\TextReader + + + cocostudio\json + + + cocostudio\json + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\armature + + + cocostudio\armature + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\datas + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\physics + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\physics_nodes + + + extension\physics_nodes + + + storage\Source Files + + + ui\BaseClasses + + + ui\BaseClasses + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\System + + + ui\System + + + ui\System + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + network\Source Files + + + network\Source Files + + + network\Source Files + + + + extension\AssetsManager + + + external\unzip + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\TimelineAction + + + cocostudio + + + ui\Layouts + + + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + deprecated + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + external\ConvertUTF + + + external\xxhash + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + physics + + + physics + + + physics + + + physics + + + physics + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + physics\chipmunk + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform\wp8 + + + platform\wp8 + + + platform\wp8 + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + platform\renderer + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosdenshion\Source Files + + + cocosdenshion\Source Files + + + cocosdenshion\Header Files + + + cocosdenshion\Header Files + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\action + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\trigger + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\TimelineAction + + + cocostudio\reader + + + cocostudio\reader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader\ButtonReader + + + cocostudio\reader\WidgetReader\CheckBoxReader + + + cocostudio\reader\WidgetReader\ImageViewReader + + + cocostudio\reader\WidgetReader\LayoutReader + + + cocostudio\reader\WidgetReader\ListViewReader + + + cocostudio\reader\WidgetReader\LoadingBarReader + + + cocostudio\reader\WidgetReader\PageViewReader + + + cocostudio\reader\WidgetReader\ScrollViewReader + + + cocostudio\reader\WidgetReader\SliderReader + + + cocostudio\reader\WidgetReader\TextAtlasReader + + + cocostudio\reader\WidgetReader\TextBMFontReader + + + cocostudio\reader\WidgetReader\TextFieldReader + + + cocostudio\reader\WidgetReader\TextReader + + + cocostudio\json + + + cocostudio\json + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson + + + cocostudio\json\rapidjson\internal + + + cocostudio\json\rapidjson\internal + + + cocostudio\json\rapidjson\internal + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\components + + + cocostudio\armature + + + cocostudio\armature + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\animation + + + cocostudio\armature\datas + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\display + + + cocostudio\armature\physics + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + cocostudio\armature\utils + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCControlExtension + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\GUI\CCScrollView + + + extension\physics_nodes + + + extension\physics_nodes + + + extension + + + extension + + + storage\Header Files + + + ui\BaseClasses + + + ui\BaseClasses + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\Layouts + + + ui\System + + + ui\System + + + ui\System + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + ui\UIWidgets\ScrollWidget + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + network\Header Files + + + + extension\AssetsManager + + + external\unzip + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\io + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\json\protobuf-lite\src\google\protobuf\stubs + + + cocostudio\TimelineAction + + + ui\Layouts + + + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + platform\renderer\shaders + + + \ No newline at end of file diff --git a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props new file mode 100644 index 0000000000..cd169e5074 --- /dev/null +++ b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props @@ -0,0 +1,32 @@ + + + + + $(MSBuildThisFileDirectory)..\..\..\ + + + + + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories); + + + WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + true + true + false + OldStyle + 4056;4996;4244;4251; + + + libGLESv2.lib;libEGL.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;libchipmunk.lib;zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype250.lib;sqlite3.lib;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;%(AdditionalDependencies) + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform);$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\tiff\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\jpeg\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories); + /IGNORE:4264 %(AdditionalOptions) + + + + + $(EngineRoot) + true + + + \ No newline at end of file diff --git a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props new file mode 100644 index 0000000000..56a1e35697 --- /dev/null +++ b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props @@ -0,0 +1,33 @@ + + + + + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform)\ + $(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\ + $(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\ + $(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform)\ + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + \ No newline at end of file diff --git a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_platform.props b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_platform.props new file mode 100644 index 0000000000..761976bf4e --- /dev/null +++ b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_platform.props @@ -0,0 +1,7 @@ + + + + + winrt_8.1 + + \ No newline at end of file diff --git a/cocos/2d/winrt_props/cocos2d_winrt.props b/cocos/2d/winrt_props/cocos2d_winrt.props new file mode 100644 index 0000000000..eb5ffb6d54 --- /dev/null +++ b/cocos/2d/winrt_props/cocos2d_winrt.props @@ -0,0 +1,32 @@ + + + + + $(MSBuildThisFileDirectory)..\..\..\ + + + + + $(EngineRoot)external\winrt-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories); + + + WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + true + true + false + OldStyle + 4056;4996;4244;4251; + + + libGLESv2.lib;libEGL.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;libchipmunk.lib;zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype250.lib;sqlite3.lib;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;%(AdditionalDependencies) + $(EngineRoot)external\winrt-specific\angle\prebuilt\$(Platform);$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\tiff\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\jpeg\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories); + /IGNORE:4264 %(AdditionalOptions) + + + + + $(EngineRoot) + true + + + \ No newline at end of file diff --git a/cocos/2d/winrt_props/cocos2d_winrt_app.props b/cocos/2d/winrt_props/cocos2d_winrt_app.props new file mode 100644 index 0000000000..d0685779c1 --- /dev/null +++ b/cocos/2d/winrt_props/cocos2d_winrt_app.props @@ -0,0 +1,15 @@ + + + + + $(EngineRoot)external\winrt-specific\angle\prebuilt\$(Platform)\ + + + + true + + + true + + + \ No newline at end of file diff --git a/cocos/2d/winrt_props/cocos2d_winrt_platform.props b/cocos/2d/winrt_props/cocos2d_winrt_platform.props new file mode 100644 index 0000000000..761976bf4e --- /dev/null +++ b/cocos/2d/winrt_props/cocos2d_winrt_platform.props @@ -0,0 +1,7 @@ + + + + + winrt_8.1 + + \ No newline at end of file diff --git a/cocos/2d/wp8_props/cocos2d_wp8.props b/cocos/2d/wp8_props/cocos2d_wp8.props new file mode 100644 index 0000000000..50cf1f6912 --- /dev/null +++ b/cocos/2d/wp8_props/cocos2d_wp8.props @@ -0,0 +1,35 @@ + + + + + wp8 + + + $(MSBuildThisFileDirectory)..\..\..\ + + + + + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories); + + + WP8;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + true + true + false + OldStyle + 4056;4996;4244;4251; + + + libGLESv2_phone.lib;libEGL_phone.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;libchipmunk.lib;zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;sqlite3.lib;d3d11.lib;dxgi.lib;dxguid.lib;xaudio2.lib;mfplat.lib;%(AdditionalDependencies) + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform);$(EngineRoot)cocos\platform\wp8;$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\tiff\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\jpeg\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories); + /IGNORE:4264 %(AdditionalOptions) + + + + + $(EngineRoot) + true + + + \ No newline at end of file diff --git a/cocos/2d/wp8_props/cocos2d_wp8_app.props b/cocos/2d/wp8_props/cocos2d_wp8_app.props new file mode 100644 index 0000000000..c15d2cff90 --- /dev/null +++ b/cocos/2d/wp8_props/cocos2d_wp8_app.props @@ -0,0 +1,34 @@ + + + + + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform)\ + $(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\ + $(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\ + $(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform)\ + $(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\ + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + \ No newline at end of file diff --git a/cocos/2d/wp8_props/cocos2d_wp8_component.props b/cocos/2d/wp8_props/cocos2d_wp8_component.props new file mode 100644 index 0000000000..b492f78d87 --- /dev/null +++ b/cocos/2d/wp8_props/cocos2d_wp8_component.props @@ -0,0 +1,9 @@ + + + + + + _WINRT_DLL;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/cocos/2d/wp_8.1_props/cocos2d_wp_8.1_platform.props b/cocos/2d/wp_8.1_props/cocos2d_wp_8.1_platform.props new file mode 100644 index 0000000000..6200885a8b --- /dev/null +++ b/cocos/2d/wp_8.1_props/cocos2d_wp_8.1_platform.props @@ -0,0 +1,7 @@ + + + + + wp_8.1 + + \ No newline at end of file diff --git a/cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters b/cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters deleted file mode 100644 index cbc9b5dc4e..0000000000 --- a/cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/cocos/audio/proj.wp8/CocosDenshion.vcxproj.user b/cocos/audio/proj.wp8/CocosDenshion.vcxproj.user deleted file mode 100644 index 17f726ed50..0000000000 --- a/cocos/audio/proj.wp8/CocosDenshion.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/cocos/audio/winrt/Audio.cpp b/cocos/audio/winrt/Audio.cpp index 76b3e10bcf..feaf711a18 100644 --- a/cocos/audio/winrt/Audio.cpp +++ b/cocos/audio/winrt/Audio.cpp @@ -1,47 +1,30 @@ -//// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -//// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -//// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -//// PARTICULAR PURPOSE. -//// -//// Copyright (c) Microsoft Corporation. All rights reserved +/* +* cocos2d-x http://www.cocos2d-x.org +* +* Copyright (c) 2010-2011 - cocos2d-x community +* +* Portions Copyright (c) Microsoft Open Technologies, Inc. +* All Rights Reserved +* +* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and limitations under the License. +*/ -#include "pch.h" #include "Audio.h" #include "MediaStreamer.h" +//#include "CCCommon.h" -static std::wstring CCUtf8ToUnicode(const char * pszUtf8Str, unsigned len/* = -1*/) -{ - std::wstring ret; - do - { - if (! pszUtf8Str) break; - // get UTF8 string length - if (-1 == len) - { - len = strlen(pszUtf8Str); - } - if (len <= 0) break; - - // get UTF16 string length - int wLen = MultiByteToWideChar(CP_UTF8, 0, pszUtf8Str, len, 0, 0); - if (0 == wLen || 0xFFFD == wLen) break; - - // convert string - wchar_t * pwszStr = new wchar_t[wLen + 1]; - if (! pwszStr) break; - pwszStr[wLen] = 0; - MultiByteToWideChar(CP_UTF8, 0, pszUtf8Str, len, pwszStr, wLen + 1); - ret = pwszStr; - if(pwszStr) { delete[] (pwszStr);}; - } while (0); - return ret; -} - -static inline void ThrowIfFailed(HRESULT hr) +inline void ThrowIfFailed(HRESULT hr) { if (FAILED(hr)) { - // Set a breakpoint on this line to catch DirectX API errors + // Set a breakpoint on this line to catch DX API errors. throw Platform::Exception::CreateException(hr); } } @@ -55,14 +38,14 @@ void AudioEngineCallbacks::Initialize(Audio *audio) // to be closed down and restarted. The error code is given in error. void _stdcall AudioEngineCallbacks::OnCriticalError(HRESULT Error) { + UNUSED_PARAM(Error); m_audio->SetEngineExperiencedCriticalError(); }; Audio::Audio() : m_backgroundID(0), - m_soundEffctVolume(1.0), + m_soundEffctVolume(1.0f), m_backgroundMusicVolume(1.0f) - { } @@ -220,8 +203,10 @@ void Audio::StopBackgroundMusic(bool bReleaseData) StopSoundEffect(m_backgroundID); - if (bReleaseData) + if (bReleaseData){ UnloadSoundEffect(m_backgroundID); + RemoveFromList(m_backgroundID); + } } void Audio::PauseBackgroundMusic() @@ -328,9 +313,6 @@ void Audio::PlaySoundEffect(unsigned int sound) m_soundEffects[sound].m_soundEffectSourceVoice->SubmitSourceBuffer(&m_soundEffects[sound].m_audioBuffer) ); - XAUDIO2_BUFFER buf = {0}; - XAUDIO2_VOICE_STATE state = {0}; - if (m_engineExperiencedCriticalError) { // If there's an error, then we'll recreate the engine on the next render pass return; @@ -426,7 +408,8 @@ void Audio::PauseAllSoundEffects() EffectList::iterator iter; for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++) { - PauseSoundEffect(iter->first); + if (iter->first != m_backgroundID) + PauseSoundEffect(iter->first); } } @@ -439,11 +422,12 @@ void Audio::ResumeAllSoundEffects() EffectList::iterator iter; for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++) { - ResumeSoundEffect(iter->first); + if (iter->first != m_backgroundID) + ResumeSoundEffect(iter->first); } } -void Audio::StopAllSoundEffects() +void Audio::StopAllSoundEffects(bool bReleaseData) { if (m_engineExperiencedCriticalError) { return; @@ -452,8 +436,27 @@ void Audio::StopAllSoundEffects() EffectList::iterator iter; for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++) { - StopSoundEffect(iter->first); + if (iter->first != m_backgroundID){ + StopSoundEffect(iter->first); + if (bReleaseData) + { + UnloadSoundEffect(iter->first); + } + } } + if (bReleaseData) + { + for (iter = m_soundEffects.begin(); iter != m_soundEffects.end();) + { + if (iter->first != m_backgroundID){ + m_soundEffects.erase(iter++); + } + else + { + iter++; + } + } + } } bool Audio::IsSoundEffectStarted(unsigned int sound) @@ -464,39 +467,66 @@ bool Audio::IsSoundEffectStarted(unsigned int sound) return m_soundEffects[sound].m_soundEffectStarted; } +std::wstring CCUtf8ToUnicode(const char * pszUtf8Str) +{ + std::wstring ret; + do + { + if (! pszUtf8Str) break; + size_t len = strlen(pszUtf8Str); + if (len <= 0) break; + ++len; + wchar_t * pwszStr = new wchar_t[len]; + if (! pwszStr) break; + pwszStr[len - 1] = 0; + MultiByteToWideChar(CP_UTF8, 0, pszUtf8Str, len, pwszStr, len); + ret = pwszStr; + + if(pwszStr) { + delete[] (pwszStr); + (pwszStr) = 0; + } + + + } while (0); + return ret; +} + +std::string CCUnicodeToUtf8(const wchar_t* pwszStr) +{ + std::string ret; + do + { + if(! pwszStr) break; + size_t len = wcslen(pwszStr); + if (len <= 0) break; + + char * pszUtf8Str = new char[len*3 + 1]; + WideCharToMultiByte(CP_UTF8, 0, pwszStr, len+1, pszUtf8Str, len*3 + 1, 0, 0); + ret = pszUtf8Str; + + if(pszUtf8Str) { + delete[] (pszUtf8Str); + (pszUtf8Str) = 0; + } + }while(0); + + return ret; +} + void Audio::PreloadSoundEffect(const char* pszFilePath, bool isMusic) { - if (m_engineExperiencedCriticalError) { return; } int sound = Hash(pszFilePath); - if (m_soundEffects.end() != m_soundEffects.find(sound)) - { - return; - } - MediaStreamer mediaStreamer; - mediaStreamer.Initialize(CCUtf8ToUnicode(pszFilePath, -1).c_str()); + mediaStreamer.Initialize(CCUtf8ToUnicode(pszFilePath).c_str()); m_soundEffects[sound].m_soundID = sound; uint32 bufferLength = mediaStreamer.GetMaxStreamLengthInBytes(); - - if (m_soundEffects.find(sound) != m_soundEffects.end()) - { - if (m_soundEffects[sound].m_soundEffectBufferData) - { - delete[] m_soundEffects[sound].m_soundEffectBufferData; - m_soundEffects[sound].m_soundEffectBufferData = NULL; - } - } - else - { - m_soundEffects[sound].m_soundEffectBufferData = NULL; - } - m_soundEffects[sound].m_soundEffectBufferData = new byte[bufferLength]; mediaStreamer.ReadAll(m_soundEffects[sound].m_soundEffectBufferData, bufferLength, &m_soundEffects[sound].m_soundEffectBufferLength); @@ -549,6 +579,8 @@ void Audio::UnloadSoundEffect(const char* pszFilePath) int sound = Hash(pszFilePath); UnloadSoundEffect(sound); + + RemoveFromList(sound); } void Audio::UnloadSoundEffect(unsigned int sound) @@ -562,15 +594,18 @@ void Audio::UnloadSoundEffect(unsigned int sound) m_soundEffects[sound].m_soundEffectSourceVoice->DestroyVoice(); - if (m_soundEffects[sound].m_soundEffectBufferData) - { - delete[] m_soundEffects[sound].m_soundEffectBufferData; - m_soundEffects[sound].m_soundEffectBufferData = NULL; - } + if(m_soundEffects[sound].m_soundEffectBufferData) + delete [] m_soundEffects[sound].m_soundEffectBufferData; + m_soundEffects[sound].m_soundEffectBufferData = nullptr; m_soundEffects[sound].m_soundEffectSourceVoice = nullptr; - m_soundEffects[sound].m_soundEffectStarted = false;// - ZeroMemory(&m_soundEffects[sound].m_audioBuffer, sizeof(m_soundEffects[sound].m_audioBuffer)); + m_soundEffects[sound].m_soundEffectStarted = false; + ZeroMemory(&m_soundEffects[sound].m_audioBuffer, sizeof(m_soundEffects[sound].m_audioBuffer)); +} +void Audio::RemoveFromList( unsigned int sound ) +{ m_soundEffects.erase(sound); } + + diff --git a/cocos/audio/winrt/Audio.h b/cocos/audio/winrt/Audio.h index ae58dc7402..a00b9a2ef7 100644 --- a/cocos/audio/winrt/Audio.h +++ b/cocos/audio/winrt/Audio.h @@ -5,14 +5,25 @@ //// //// Copyright (c) Microsoft Corporation. All rights reserved +// For licensing information relating to this distribution please see Third Party Notices file. + #pragma once -#include "pch.h" +#include +#include +#include +#include +#include + +#define XAUDIO2_HELPER_FUNCTIONS 1 +#include #include static const int STREAMING_BUFFER_SIZE = 65536; static const int MAX_BUFFER_COUNT = 3; +#define UNUSED_PARAM(unusedparam) (void)unusedparam + struct SoundEffectData { unsigned int m_soundID; @@ -85,10 +96,11 @@ private: StreamingVoiceContext m_voiceContext; typedef std::map EffectList; - EffectList m_soundEffects; + typedef std::pair Effect; + EffectList m_soundEffects; - unsigned int m_backgroundID; - std::string m_backgroundFile; + unsigned int m_backgroundID; + std::string m_backgroundFile; bool m_backgroundLoop; float m_soundEffctVolume; @@ -144,9 +156,12 @@ public: void PauseAllSoundEffects(); void ResumeAllSoundEffects(); - void StopAllSoundEffects(); + void StopAllSoundEffects(bool bReleaseData); void PreloadSoundEffect(const char* pszFilePath, bool isMusic = false); void UnloadSoundEffect(const char* pszFilePath); void UnloadSoundEffect(unsigned int sound); + +private: + void RemoveFromList(unsigned int sound); }; diff --git a/cocos/audio/winrt/MediaStreamer.cpp b/cocos/audio/winrt/MediaStreamer.cpp index f6f985bf5b..fc6287cd04 100644 --- a/cocos/audio/winrt/MediaStreamer.cpp +++ b/cocos/audio/winrt/MediaStreamer.cpp @@ -1,49 +1,126 @@ -//// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -//// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -//// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -//// PARTICULAR PURPOSE. -//// -//// Copyright (c) Microsoft Corporation. All rights reserved +/* +* cocos2d-x http://www.cocos2d-x.org +* +* Copyright (c) 2010-2011 - cocos2d-x community +* +* Portions Copyright (c) Microsoft Open Technologies, Inc. +* All Rights Reserved +* +* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and limitations under the License. +*/ -#include "pch.h" #include "MediaStreamer.h" -using namespace Windows::ApplicationModel; +#include +#include +#include -static inline void ThrowIfFailed(HRESULT hr) +#include +#include + +using namespace Microsoft::WRL; +using namespace Windows::Storage; +using namespace Windows::Storage::FileProperties; +using namespace Windows::Storage::Streams; +using namespace Windows::Foundation; +using namespace Windows::ApplicationModel; +using namespace Concurrency; + +#ifndef MAKEFOURCC + #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((uint32)(byte)(ch0) | ((uint32)(byte)(ch1) << 8) | \ + ((uint32)(byte)(ch2) << 16) | ((uint32)(byte)(ch3) << 24 )) +#endif /* defined(MAKEFOURCC) */ + +inline void ThrowIfFailed(HRESULT hr) { if (FAILED(hr)) { - // Set a breakpoint on this line to catch DirectX API errors + // Set a breakpoint on this line to catch DX API errors. throw Platform::Exception::CreateException(hr); } } - -MediaStreamer::MediaStreamer() +MediaStreamer::MediaStreamer() : + m_offset(0) { - m_reader = nullptr; - m_audioType = nullptr; ZeroMemory(&m_waveFormat, sizeof(m_waveFormat)); - - m_installedLocation = Package::Current->InstalledLocation; - m_installedLocationPath = Platform::String::Concat(m_installedLocation->Path, "\\Assets\\Resources\\"); + m_location = Package::Current->InstalledLocation; + m_locationPath = Platform::String::Concat(m_location->Path, "\\Assets\\Resources\\"); } MediaStreamer::~MediaStreamer() { } +Platform::Array^ MediaStreamer::ReadData( + _In_ Platform::String^ filename + ) +{ + CREATEFILE2_EXTENDED_PARAMETERS extendedParams = {0}; + extendedParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); + extendedParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + extendedParams.dwFileFlags = FILE_FLAG_SEQUENTIAL_SCAN; + extendedParams.dwSecurityQosFlags = SECURITY_ANONYMOUS; + extendedParams.lpSecurityAttributes = nullptr; + extendedParams.hTemplateFile = nullptr; + + Wrappers::FileHandle file( + CreateFile2( + filename->Data(), + GENERIC_READ, + FILE_SHARE_READ, + OPEN_EXISTING, + &extendedParams + ) + ); + if (file.Get()==INVALID_HANDLE_VALUE) + { + throw ref new Platform::FailureException(); + } + + FILE_STANDARD_INFO fileInfo = {0}; + if (!GetFileInformationByHandleEx( + file.Get(), + FileStandardInfo, + &fileInfo, + sizeof(fileInfo) + )) + { + throw ref new Platform::FailureException(); + } + + if (fileInfo.EndOfFile.HighPart != 0) + { + throw ref new Platform::OutOfMemoryException(); + } + + Platform::Array^ fileData = ref new Platform::Array(fileInfo.EndOfFile.LowPart); + + if (!ReadFile( + file.Get(), + fileData->Data, + fileData->Length, + nullptr, + nullptr + ) ) + { + throw ref new Platform::FailureException(); + } + + return fileData; +} void MediaStreamer::Initialize(__in const WCHAR* url) { - Microsoft::WRL::ComPtr outputMediaType; - Microsoft::WRL::ComPtr mediaType; - - ThrowIfFailed( - MFStartup(MF_VERSION) - ); - WCHAR filePath[MAX_PATH] = {0}; + WCHAR filePath[MAX_PATH] = {0}; if ((wcslen(url) > 1 && url[1] == ':')) { // path start with "x:", is absolute path @@ -53,163 +130,92 @@ void MediaStreamer::Initialize(__in const WCHAR* url) && (L'/' == url[0] || L'\\' == url[0])) { // path start with '/' or '\', is absolute path without driver name - wcscat_s(filePath, m_installedLocationPath->Data()); + wcscat_s(filePath, m_locationPath->Data()); // remove '/' or '\\' wcscat_s(filePath, (const WCHAR*)url[1]); }else { - wcscat_s(filePath, m_installedLocationPath->Data()); + wcscat_s(filePath, m_locationPath->Data()); wcscat_s(filePath, url); } - ThrowIfFailed( - MFCreateSourceReaderFromURL(filePath, nullptr, &m_reader) - ); - // Set the decoded output format as PCM - // XAudio2 on Windows can process PCM and ADPCM-encoded buffers. - // When using MF, this sample always decodes into PCM. + Platform::Array^ data = ReadData(ref new Platform::String(filePath)); + UINT32 length = data->Length; + const byte * dataPtr = data->Data; + UINT32 offset = 0; - ThrowIfFailed( - MFCreateMediaType(&mediaType) - ); + DWORD riffDataSize = 0; - ThrowIfFailed( - mediaType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio) - ); + auto ReadChunk = [&length, &offset, &dataPtr, &riffDataSize](DWORD fourcc, DWORD& outChunkSize, DWORD& outChunkPos) -> HRESULT + { + while (true) + { + if (offset + sizeof(DWORD) * 2 >= length) + { + return E_FAIL; + } - ThrowIfFailed( - mediaType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_PCM) - ); + // Read two DWORDs. + DWORD chunkType = *reinterpret_cast(&dataPtr[offset]); + DWORD chunkSize = *reinterpret_cast(&dataPtr[offset + sizeof(DWORD)]); + offset += sizeof(DWORD) * 2; - ThrowIfFailed( - m_reader->SetCurrentMediaType(MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, mediaType.Get()) - ); + if (chunkType == MAKEFOURCC('R', 'I', 'F', 'F')) + { + riffDataSize = chunkSize; + chunkSize = sizeof(DWORD); + outChunkSize = sizeof(DWORD); + outChunkPos = offset; + } + else + { + outChunkSize = chunkSize; + outChunkPos = offset; + } - // Get the complete WAVEFORMAT from the Media Type - ThrowIfFailed( - m_reader->GetCurrentMediaType(MF_SOURCE_READER_FIRST_AUDIO_STREAM, &outputMediaType) - ); + offset += chunkSize; - uint32 formatSize = 0; - WAVEFORMATEX* waveFormat; - ThrowIfFailed( - MFCreateWaveFormatExFromMFMediaType(outputMediaType.Get(), &waveFormat, &formatSize) - ); - CopyMemory(&m_waveFormat, waveFormat, sizeof(m_waveFormat)); - CoTaskMemFree(waveFormat); + if (chunkType == fourcc) + { + return S_OK; + } + } + }; - // Get the total length of the stream in bytes - PROPVARIANT var; - ThrowIfFailed( - m_reader->GetPresentationAttribute(MF_SOURCE_READER_MEDIASOURCE, MF_PD_DURATION, &var) - ); - LONGLONG duration = var.uhVal.QuadPart; - double durationInSeconds = (duration / static_cast(10000000)); // duration is in 100ns units, convert to seconds - m_maxStreamLengthInBytes = static_cast(durationInSeconds * m_waveFormat.nAvgBytesPerSec); + // Locate riff chunk, check the file type. + DWORD chunkSize = 0; + DWORD chunkPos = 0; - // Round up the buffer size to the nearest four bytes - m_maxStreamLengthInBytes = (m_maxStreamLengthInBytes + 3) / 4 * 4; -} + ThrowIfFailed(ReadChunk(MAKEFOURCC('R', 'I', 'F', 'F'), chunkSize, chunkPos)); + if (*reinterpret_cast(&dataPtr[chunkPos]) != MAKEFOURCC('W', 'A', 'V', 'E')) ThrowIfFailed(E_FAIL); -bool MediaStreamer::GetNextBuffer(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength) -{ - Microsoft::WRL::ComPtr sample; - Microsoft::WRL::ComPtr mediaBuffer; - BYTE *audioData = nullptr; - DWORD sampleBufferLength = 0; - DWORD flags = 0; + // Locate 'fmt ' chunk, copy to WAVEFORMATEXTENSIBLE. + ThrowIfFailed(ReadChunk(MAKEFOURCC('f', 'm', 't', ' '), chunkSize, chunkPos)); + ThrowIfFailed((chunkSize <= sizeof(m_waveFormat)) ? S_OK : E_FAIL); + CopyMemory(&m_waveFormat, &dataPtr[chunkPos], chunkSize); - *bufferLength = 0; + // Locate the 'data' chunk and copy its contents to a buffer. + ThrowIfFailed(ReadChunk(MAKEFOURCC('d', 'a', 't', 'a'), chunkSize, chunkPos)); + m_data.resize(chunkSize); + CopyMemory(m_data.data(), &dataPtr[chunkPos], chunkSize); - if (m_reader == nullptr) - { - return false; - } - - ThrowIfFailed( - m_reader->ReadSample(MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, nullptr, &flags, nullptr, &sample) - ); - - if (sample == nullptr) - { - if (flags & MF_SOURCE_READERF_ENDOFSTREAM) - { - return true; - } - else - { - return false; - } - } - - ThrowIfFailed( - sample->ConvertToContiguousBuffer(&mediaBuffer) - ); - - ThrowIfFailed( - mediaBuffer->Lock(&audioData, nullptr, &sampleBufferLength) - ); - - // If buffer isn't large enough, dump sample - if (sampleBufferLength <= maxBufferSize) - { - CopyMemory(buffer, audioData, sampleBufferLength); - *bufferLength = sampleBufferLength; - } - else - { -#if defined(COCOS2D_DEBUG) - OutputDebugString(L"Sample buffer dumped"); -#endif - } - - if (flags & MF_SOURCE_READERF_ENDOFSTREAM) - { - return true; - } - else - { - return false; - } + m_offset = 0; } void MediaStreamer::ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength) { - uint32 valuesWritten = 0; - uint32 sampleBufferLength = 0; + UINT32 toCopy = m_data.size() - m_offset; + if (toCopy > maxBufferSize) toCopy = maxBufferSize; - if (m_reader == nullptr) - { - return; - } + CopyMemory(buffer, m_data.data(), toCopy); + *bufferLength = toCopy; - *bufferLength = 0; - // If buffer isn't large enough, return - if (maxBufferSize < m_maxStreamLengthInBytes) - { - return; - } - - while (!GetNextBuffer(buffer + valuesWritten, maxBufferSize - valuesWritten, &sampleBufferLength)) - { - valuesWritten += sampleBufferLength; - } - - *bufferLength = valuesWritten + sampleBufferLength; + m_offset += toCopy; + if (m_offset > m_data.size()) m_offset = m_data.size(); } void MediaStreamer::Restart() { - if (m_reader == nullptr) - { - return; - } - - PROPVARIANT var = {0}; - var.vt = VT_I8; - - ThrowIfFailed( - m_reader->SetCurrentPosition(GUID_NULL, var) - ); + m_offset = 0; } diff --git a/cocos/audio/winrt/MediaStreamer.h b/cocos/audio/winrt/MediaStreamer.h index cafbfe0993..e72ac5974a 100644 --- a/cocos/audio/winrt/MediaStreamer.h +++ b/cocos/audio/winrt/MediaStreamer.h @@ -1,28 +1,46 @@ -//// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -//// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -//// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -//// PARTICULAR PURPOSE. -//// -//// Copyright (c) Microsoft Corporation. All rights reserved +/* +* cocos2d-x http://www.cocos2d-x.org +* +* Copyright (c) 2010-2011 - cocos2d-x community +* +* Portions Copyright (c) Microsoft Open Technologies, Inc. +* All Rights Reserved +* +* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and limitations under the License. +*/ #pragma once -#include "pch.h" -class MediaStreamer +#include +#include +#include + +ref class MediaStreamer { private: - WAVEFORMATEX m_waveFormat; - uint32 m_maxStreamLengthInBytes; - Windows::Storage::StorageFolder^ m_installedLocation; - Platform::String^ m_installedLocationPath; + WAVEFORMATEX m_waveFormat; + uint32 m_maxStreamLengthInBytes; + std::vector m_data; + UINT32 m_offset; + Platform::Array^ ReadData( + _In_ Platform::String^ filename + ); +internal: + Windows::Storage::StorageFolder^ m_location; + Platform::String^ m_locationPath; public: - Microsoft::WRL::ComPtr m_reader; - Microsoft::WRL::ComPtr m_audioType; + virtual ~MediaStreamer(); -public: +internal: MediaStreamer(); - ~MediaStreamer(); WAVEFORMATEX& GetOutputWaveFormatEx() { @@ -31,11 +49,10 @@ public: UINT32 GetMaxStreamLengthInBytes() { - return m_maxStreamLengthInBytes; + return m_data.size(); } void Initialize(_In_ const WCHAR* url); - bool GetNextBuffer(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength); void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength); void Restart(); }; diff --git a/cocos/audio/winrt/SimpleAudioEngine.cpp b/cocos/audio/winrt/SimpleAudioEngine.cpp index 510cd6434c..6a9b17354b 100644 --- a/cocos/audio/winrt/SimpleAudioEngine.cpp +++ b/cocos/audio/winrt/SimpleAudioEngine.cpp @@ -1,52 +1,51 @@ -/**************************************************************************** -Copyright (c) 2010-2013 cocos2d-x.org -Copyright (c) Microsoft Open Technologies, Inc. +/* +* cocos2d-x http://www.cocos2d-x.org +* +* Copyright (c) 2010-2011 - cocos2d-x community +* +* Portions Copyright (c) Microsoft Open Technologies, Inc. +* All Rights Reserved +* +* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and limitations under the License. +*/ -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ #include "SimpleAudioEngine.h" #include "Audio.h" #include - //#include "CCCommon.h" using namespace std; namespace CocosDenshion { - - Audio* s_audioController = NULL; -// a flag that if the s_audioController should be re-initialiezed -// see also in SimpleAudioEngine::end() in this file -bool s_bAudioControllerNeedReInitialize = true; +bool s_initialized = false; + +SimpleAudioEngine* SimpleAudioEngine::getInstance() +{ + static SimpleAudioEngine s_SharedEngine; + return &s_SharedEngine; +} + static Audio* sharedAudioController() { - if ((! s_audioController) || s_bAudioControllerNeedReInitialize) + if (! s_audioController || !s_initialized) { - s_audioController = new Audio; + if(s_audioController == NULL) + { + s_audioController = new Audio; + } s_audioController->Initialize(); s_audioController->CreateResources(); - s_bAudioControllerNeedReInitialize = false; + s_initialized = true; } return s_audioController; @@ -60,29 +59,16 @@ SimpleAudioEngine::~SimpleAudioEngine() { } -SimpleAudioEngine* SimpleAudioEngine::sharedEngine() -{ - static SimpleAudioEngine s_SharedEngine; - return &s_SharedEngine; -} void SimpleAudioEngine::end() { sharedAudioController()->StopBackgroundMusic(true); - sharedAudioController()->StopAllSoundEffects(); + sharedAudioController()->StopAllSoundEffects(true); sharedAudioController()->ReleaseResources(); - //set here to tell the s_bAudioControllerNeedReInitialize should be re-initialized - s_bAudioControllerNeedReInitialize = true; + s_initialized = false; } -#if 0 -void SimpleAudioEngine::render() -{ - sharedAudioController()->Render(); -} -#endif - ////////////////////////////////////////////////////////////////////////// // BackgroundMusic @@ -132,11 +118,11 @@ bool SimpleAudioEngine::isBackgroundMusicPlaying() // effect function ////////////////////////////////////////////////////////////////////////// -unsigned int SimpleAudioEngine::playEffect(const char* pszFilePath, bool bLoop) +unsigned int SimpleAudioEngine::playEffect(const char* pszFilePath, bool bLoop,float pitch, float pan, float gain) { unsigned int sound; sharedAudioController()->PlaySoundEffect(pszFilePath, bLoop, sound); - + // TODO: need to support playEffect parameters return sound; } @@ -172,12 +158,12 @@ void SimpleAudioEngine::resumeAllEffects() void SimpleAudioEngine::stopAllEffects() { - sharedAudioController()->StopAllSoundEffects(); + sharedAudioController()->StopAllSoundEffects(false); } void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath) { - + UNUSED_PARAM(pszFilePath); } void SimpleAudioEngine::unloadEffect(const char* pszFilePath) diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 827217ed0f..782446ad8f 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -40,7 +40,7 @@ #include #include #define bzero(a, b) memset(a, 0, b); -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "inet_ntop_winrt.h" #include "CCWinRTUtils.h" #endif @@ -111,8 +111,6 @@ static bool isFloat( std::string myString ) { return iss.eof() && !iss.fail(); } -#if CC_TARGET_PLATFORM != CC_PLATFORM_WINRT - // helper free functions // dprintf() is not defined in Android @@ -183,7 +181,6 @@ static void printFileUtils(int fd) } sendPrompt(fd); } -#endif #if defined(__MINGW32__) @@ -231,9 +228,7 @@ static void _log(const char *format, va_list args) fflush(stdout); #endif -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) Director::getInstance()->getConsole()->log(buf); -#endif } @@ -254,8 +249,6 @@ void log(const char * format, ...) va_end(args); } -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) - // // Console code // @@ -328,7 +321,7 @@ bool Console::listenOnTCP(int port) hints.ai_family = AF_INET; // AF_UNSPEC: Do we need IPv6 ? hints.ai_socktype = SOCK_STREAM; -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) WSADATA wsaData; n = WSAStartup(MAKEWORD(2, 2),&wsaData); @@ -354,7 +347,7 @@ bool Console::listenOnTCP(int port) break; /* success */ /* bind error, close and try next one */ -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) closesocket(listenfd); #else close(listenfd); @@ -441,7 +434,7 @@ void Console::commandExit(int fd, const std::string &args) { FD_CLR(fd, &_read_set); _fds.erase(std::remove(_fds.begin(), _fds.end(), fd), _fds.end()); -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) closesocket(fd); #else close(fd); @@ -1074,7 +1067,7 @@ void Console::loop() //receive a SIGPIPE, which will cause linux system shutdown the sending process. //Add this ioctl code to check if the socket has been closed by peer. -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) u_long n = 0; ioctlsocket(fd, FIONREAD, &n); #else @@ -1119,14 +1112,14 @@ void Console::loop() // clean up: ignore stdin, stdout and stderr for(const auto &fd: _fds ) { -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) closesocket(fd); #else close(fd); #endif } -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) closesocket(_listenfd); WSACleanup(); #else @@ -1135,7 +1128,6 @@ void Console::loop() _running = false; } -#endif /* #if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) */ NS_CC_END diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h index 7e05a4bf29..f8fa0b2b03 100644 --- a/cocos/base/CCConsole.h +++ b/cocos/base/CCConsole.h @@ -72,7 +72,6 @@ void CC_DLL log(const char * format, ...) CC_FORMAT_PRINTF(1, 2); ``` */ -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) class CC_DLL Console : public Ref { @@ -148,7 +147,6 @@ private: CC_DISALLOW_COPY_AND_ASSIGN(Console); }; -#endif /* #if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) */ NS_CC_END #endif /* defined(__CCCONSOLE_H__) */ diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index d4a90c6080..a531f632c9 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -1276,8 +1276,10 @@ void DisplayLinkDirector::startAnimation() _invalid = false; +#ifndef WP8_SHADER_COMPILER Application::getInstance()->setAnimationInterval(_animationInterval); - +#endif + // fix issue #3509, skip one fps to avoid incorrect time calculation. setNextDeltaTimeZero(true); } diff --git a/cocos/base/CCDirector.h b/cocos/base/CCDirector.h index d786885574..d84464a994 100644 --- a/cocos/base/CCDirector.h +++ b/cocos/base/CCDirector.h @@ -59,9 +59,7 @@ class TextureCache; class Renderer; class Camera; -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) class Console; -#endif /** @brief Class that creates and handles the main Window and manages how @@ -391,9 +389,7 @@ public: /** Returns the Console @since v3.0 */ -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) Console* getConsole() const { return _console; } -#endif /* Gets delta time since last tick to main loop */ float getDeltaTime() const; @@ -503,10 +499,8 @@ protected: /* Renderer for the Director */ Renderer *_renderer; -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) /* Console for the director */ Console *_console; -#endif // GLView will recreate stats labels to fit visible rect friend class GLView; diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 0bc497855e..acf8bdcc3c 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -224,10 +224,9 @@ THE SOFTWARE. #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "platform/winrt/CCApplication.h" - #include "platform/winrt/CCGLViewImpl.h" + #include "platform/winrt/CCGLViewImpl-winrt.h" #include "platform/winrt/CCGL.h" #include "platform/winrt/CCStdC.h" - #include "platform/winrt/CCPrecompiledShaders.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) diff --git a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj deleted file mode 100644 index aa05847ade..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj +++ /dev/null @@ -1,225 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2} - libCocosBuilder - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters b/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters deleted file mode 100644 index 04df7aa8c6..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters +++ /dev/null @@ -1,170 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user b/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user deleted file mode 100644 index 17f726ed50..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/cocos/editor-support/cocosbuilder/proj.wp8/pch.h b/cocos/editor-support/cocosbuilder/proj.wp8/pch.h deleted file mode 100644 index 4c3b8cde28..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.wp8/pch.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "cocos2d.h" -#include "cocos-ext.h" -#include "ExtensionMacros.h" diff --git a/cocos/editor-support/cocostudio/CocosStudioExport.h b/cocos/editor-support/cocostudio/CocosStudioExport.h index ed5d79d622..062566fb64 100644 --- a/cocos/editor-support/cocostudio/CocosStudioExport.h +++ b/cocos/editor-support/cocostudio/CocosStudioExport.h @@ -1,7 +1,7 @@ #ifndef __CCCOCOSSTUDIO_H__ #define __CCCOCOSSTUDIO_H__ -#if defined(WIN32) && defined(_WINDOWS) +#if (defined(WIN32) && defined(_WINDOWS)) || defined(WINRT) || defined(WP8) #ifdef __MINGW32__ #include #endif diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj deleted file mode 100644 index bbceb192f9..0000000000 --- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj +++ /dev/null @@ -1,302 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E} - libCocosStudio - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - /Zm200 %(AdditionalOptions) - pch.h - true - OldStyle - true - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - /Zm200 %(AdditionalOptions) - pch.h - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters deleted file mode 100644 index e9d25e2379..0000000000 --- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters +++ /dev/null @@ -1,464 +0,0 @@ - - - - - {d793b86c-0905-4c9b-b6bc-161e351c9eb2} - - - {855f2366-3429-4f77-a080-a41a39c99270} - - - {1a8c6b14-fb28-4485-8417-9b6838fbc4ef} - - - {42f1ce3f-46ab-4a16-a96e-9eb076c873f7} - - - {f8271f80-1663-4425-91c8-7365ec3af017} - - - {48f28446-ffe4-4aa1-a34c-8968c3367ae6} - - - {ad9b4fd1-dc17-4704-9c60-7709eb916f13} - - - {55c682b3-7a48-4fab-ad5a-eb979f3c305e} - - - {c6464479-e0ab-4afc-96fc-1ffc73e40232} - - - {023e3440-1259-4981-ba54-24390d1df447} - - - {f1f20817-9232-4967-a4dd-77550e84e39b} - - - {5149f922-cf29-4a4b-b604-f15c6e8856b0} - - - {59eee6d9-bbfd-4193-be1d-6c18fc38f896} - - - {e30e7bb0-8b73-431a-8461-2c388dfc68cc} - - - {96dd2db1-898a-4598-8001-72601e5665c3} - - - {04e763fc-669f-4440-b3da-2714bb653c75} - - - {053ab44f-ac1f-43ed-8d18-3642f3f57df1} - - - {f1888260-467c-446c-a866-882d67815bb3} - - - {193f7228-6f8c-40ae-916d-811ebb25fa5e} - - - {2413c186-a78b-484d-899d-0c000ca685d7} - - - {d6e0aa43-c62f-4b05-87b0-6b2a6bd00de4} - - - {15bcf867-facd-4e74-a1fe-375b5126d97c} - - - {1d49f0ff-ed53-4181-ace7-6cd2e77cfc76} - - - {a795a46f-a9d7-44c0-9818-edb59b2f0794} - - - {38d21f2e-d189-47e8-b244-6a07dcc0a692} - - - {315e19a3-2ad5-4ffa-93cd-e5ce9812ab76} - - - {695e45cf-2af5-4bdb-84a2-f0e9f3d77f11} - - - {5f5a98dd-657c-4a9b-8862-c11555ad1293} - - - - - components - - - components - - - components - - - components - - - components - - - json - - - reader - - - reader - - - armature\animation - - - armature\animation - - - armature\animation - - - armature\datas - - - armature\display - - - armature\display - - - armature\display - - - armature\display - - - armature\display - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\physics - - - armature - - - armature - - - action - - - action - - - action - - - action - - - action - - - trigger - - - trigger - - - trigger - - - reader\WidgetReader - - - reader\WidgetReader\ButtonReader - - - reader\WidgetReader\CheckBoxReader - - - reader\WidgetReader\ImageViewReader - - - reader\WidgetReader\LayoutReader - - - reader\WidgetReader\ListViewReader - - - reader\WidgetReader\LoadingBarReader - - - reader\WidgetReader\TextReader - - - reader\WidgetReader\TextFieldReader - - - reader\WidgetReader\TextBMFontReader - - - reader\WidgetReader\TextAtlasReader - - - reader\WidgetReader\SliderReader - - - reader\WidgetReader\ScrollViewReader - - - reader\WidgetReader\PageViewReader - - - - TimelineAction - - - TimelineAction - - - TimelineAction - - - TimelineAction - - - json - - - json - - - TimelineAction - - - - - components - - - components - - - components - - - components - - - components - - - json - - - reader - - - reader - - - armature\animation - - - armature\animation - - - armature\animation - - - armature\datas - - - armature\display - - - armature\display - - - armature\display - - - armature\display - - - armature\display - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\utils - - - armature\physics - - - armature - - - armature - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson - - - json\rapidjson\internal - - - json\rapidjson\internal - - - json\rapidjson\internal - - - action - - - action - - - action - - - action - - - action - - - trigger - - - trigger - - - trigger - - - components - - - reader\WidgetReader - - - reader\WidgetReader - - - reader\WidgetReader\ButtonReader - - - reader\WidgetReader\CheckBoxReader - - - reader\WidgetReader\ImageViewReader - - - reader\WidgetReader\LayoutReader - - - reader\WidgetReader\ListViewReader - - - reader\WidgetReader\LoadingBarReader - - - reader\WidgetReader\TextReader - - - reader\WidgetReader\TextFieldReader - - - reader\WidgetReader\TextBMFontReader - - - reader\WidgetReader\TextAtlasReader - - - reader\WidgetReader\SliderReader - - - reader\WidgetReader\ScrollViewReader - - - reader\WidgetReader\PageViewReader - - - - TimelineAction - - - TimelineAction - - - TimelineAction - - - TimelineAction - - - TimelineAction - - - json - - - json - - - TimelineAction - - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user deleted file mode 100644 index 17f726ed50..0000000000 --- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.wp8/pch.cpp b/cocos/editor-support/cocostudio/proj.wp8/pch.cpp deleted file mode 100644 index bcb5590be1..0000000000 --- a/cocos/editor-support/cocostudio/proj.wp8/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/cocos/editor-support/cocostudio/proj.wp8/pch.h b/cocos/editor-support/cocostudio/proj.wp8/pch.h deleted file mode 100644 index 4c3b8cde28..0000000000 --- a/cocos/editor-support/cocostudio/proj.wp8/pch.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "cocos2d.h" -#include "cocos-ext.h" -#include "ExtensionMacros.h" diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems new file mode 100644 index 0000000000..6016db9f75 --- /dev/null +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems @@ -0,0 +1,74 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {adafd00d-a0d6-46ef-9f0b-ea2880bfe1de} + libSpine + libSpine.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters new file mode 100644 index 0000000000..7311b63e33 --- /dev/null +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj new file mode 100644 index 0000000000..dad17f335d --- /dev/null +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj @@ -0,0 +1,229 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {f3550fe0-c795-44f6-8feb-093eb68143ae} + libSpine + en-US + 12.0 + true + Windows Store + 8.1 + CodeSharingStaticLibrary + + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + false + + + false + + + false + + + false + + + + NotUsing + true + true + WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + NotUsing + true + true + WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + NotUsing + true + true + WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + NotUsing + true + true + WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + NotUsing + true + true + WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + NotUsing + true + true + WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + /IGNORE:4264 %(AdditionalOptions) + + + + + + \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters new file mode 100644 index 0000000000..a7761ab018 --- /dev/null +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + diff --git a/cocos/audio/proj.wp8/CocosDenshion.vcxproj b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj similarity index 50% rename from cocos/audio/proj.wp8/CocosDenshion.vcxproj rename to cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj index 65cc59fcec..29792e4c2d 100644 --- a/cocos/audio/proj.wp8/CocosDenshion.vcxproj +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj @@ -1,89 +1,103 @@  - + - - Debug - Win32 - Debug ARM - - Release + + Debug Win32 Release ARM + + Release + Win32 + - {DF125891-EEE9-4466-B903-F828FD272158} - CocosDenshion.win32 + {cc1da216-a80d-4be4-b309-acb6af313aff} + libSpine en-US - 11.0 + 12.0 + true + Windows Phone + 8.1 + CodeSharingStaticLibrary StaticLibrary true - v110_wp80 + v120_wp81 StaticLibrary true - v110_wp80 + v120_wp81 StaticLibrary false true - v110_wp80 + v120_wp81 StaticLibrary false true - v110_wp80 + v120_wp81 - - - + - - - - - - + + + - - + + + + + + + + - - + + + - + + false + + + false + + + false + + false - _LIB;%(PreprocessorDefinitions) NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 + true + true + WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) Console false + false /IGNORE:4264 %(AdditionalOptions) @@ -91,80 +105,56 @@ - _LIB;NDEBUG;%(PreprocessorDefinitions) NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 + true + true + WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) Console false + false /IGNORE:4264 %(AdditionalOptions) - + - _LIB;%(PreprocessorDefinitions) NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 + true + true + WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) Console false + false /IGNORE:4264 %(AdditionalOptions) - + - _LIB;NDEBUG;%(PreprocessorDefinitions) NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 + true + true + WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) Console false + false /IGNORE:4264 %(AdditionalOptions) - - - true - - - true - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters new file mode 100644 index 0000000000..a7761ab018 --- /dev/null +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + diff --git a/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj b/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj index 25bdccc1b9..0735f4a92a 100644 --- a/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj @@ -52,20 +52,16 @@ - - + - - + - - + - - + @@ -78,7 +74,7 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) + WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h /Zm200 %(AdditionalOptions) @@ -98,7 +94,7 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) + WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) pch.h /Zm200 %(AdditionalOptions) @@ -117,7 +113,7 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) + WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h /Zm200 %(AdditionalOptions) @@ -137,7 +133,7 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) + WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) pch.h /Zm200 %(AdditionalOptions) @@ -163,6 +159,7 @@ + @@ -189,9 +186,14 @@ - + + Create + Create + Create + Create + @@ -217,11 +219,5 @@ - - Create - Create - Create - Create - \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters b/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters index b1f53f5b14..2261762307 100644 --- a/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters +++ b/cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters @@ -89,7 +89,7 @@ Header Files - + Header Files @@ -169,7 +169,7 @@ Source Files - + Source Files diff --git a/cocos/editor-support/spine/proj.wp8/pch.cpp b/cocos/editor-support/spine/proj.wp8/pch.cpp deleted file mode 100644 index bcb5590be1..0000000000 --- a/cocos/editor-support/spine/proj.wp8/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/cocos/editor-support/spine/proj.wp8/pch.h b/cocos/editor-support/spine/proj.wp8/pch.h deleted file mode 100644 index 4c3b8cde28..0000000000 --- a/cocos/editor-support/spine/proj.wp8/pch.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "cocos2d.h" -#include "cocos-ext.h" -#include "ExtensionMacros.h" diff --git a/cocos/network/proj.wp8/libNetwork.vcxproj b/cocos/network/proj.wp8/libNetwork.vcxproj deleted file mode 100644 index 5f3328d874..0000000000 --- a/cocos/network/proj.wp8/libNetwork.vcxproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E} - network.win32 - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) - 4251 - false - - - Console - false - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 - false - - - Console - false - - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) - 4251 - false - - - Console - false - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4251 - false - - - Console - false - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/network/proj.wp8/libNetwork.vcxproj.filters b/cocos/network/proj.wp8/libNetwork.vcxproj.filters deleted file mode 100644 index f3ad86ae8c..0000000000 --- a/cocos/network/proj.wp8/libNetwork.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/cocos/platform/CCPlatformDefine.h b/cocos/platform/CCPlatformDefine.h index 0422c24c21..4a581ddb8a 100644 --- a/cocos/platform/CCPlatformDefine.h +++ b/cocos/platform/CCPlatformDefine.h @@ -37,7 +37,7 @@ THE SOFTWARE. #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "platform/win32/CCPlatformDefine-win32.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "platform/winrt/CCPlatformDefine.h" +#include "platform/winrt/CCPlatformDefine-winrt.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/linux/CCPlatformDefine-linux.h" #endif diff --git a/cocos/platform/winrt/CCApplication.cpp b/cocos/platform/winrt/CCApplication.cpp index 009e1a06b9..caa182f877 100644 --- a/cocos/platform/winrt/CCApplication.cpp +++ b/cocos/platform/winrt/CCApplication.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "platform/winrt/CCGLViewImpl.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #else #include "platform/wp8/CCGLViewImpl-wp8.h" #endif diff --git a/cocos/platform/winrt/CCDevice.cpp b/cocos/platform/winrt/CCDevice.cpp index 253d838fd0..2fd9823ef6 100644 --- a/cocos/platform/winrt/CCDevice.cpp +++ b/cocos/platform/winrt/CCDevice.cpp @@ -122,8 +122,11 @@ void Device::setAccelerometerEnabled(bool isEnabled) break; } #endif + +#ifndef WP8_SHADER_COMPILER std::shared_ptr event(new AccelerometerEvent(acc)); cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(event); +#endif }); } } diff --git a/cocos/platform/winrt/CCGL.h b/cocos/platform/winrt/CCGL.h index 91f91495d5..2b39255fed 100644 --- a/cocos/platform/winrt/CCGL.h +++ b/cocos/platform/winrt/CCGL.h @@ -26,6 +26,25 @@ THE SOFTWARE. #ifndef __CCGL_H__ #define __CCGL_H__ +#define GL_BGRA GL_BGRA_EXT +#define glClearDepth glClearDepthf +#define GL_WRITE_ONLY GL_WRITE_ONLY_OES + +#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT && !defined(WP8_SHADER_COMPILER) +#include "EGL/egl.h" +#include "EGL/eglext.h" +#include "EGL/eglplatform.h" +#include "GLES2/gl2.h" +#include "GLES2/gl2ext.h" +#include "GLES3/gl3.h" +#include "GLES3/gl3ext.h" + +#define glMapBuffer glMapBufferOES + +#else #include "CCGL_Angle.h" +#endif + + #endif // __CCGL_H__ diff --git a/cocos/platform/winrt/CCGLViewImpl-winrt.cpp b/cocos/platform/winrt/CCGLViewImpl-winrt.cpp new file mode 100644 index 0000000000..d5ecc8e138 --- /dev/null +++ b/cocos/platform/winrt/CCGLViewImpl-winrt.cpp @@ -0,0 +1,552 @@ +/**************************************************************************** +Copyright (c) 2013 cocos2d-x.org +Copyright (c) Microsoft Open Technologies, Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#include "CCGLViewImpl-winrt.h" +#include "deprecated/CCSet.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "base/CCTouch.h" +#include "base/CCIMEDispatcher.h" +#include "CCApplication.h" +#include "CCWinRTUtils.h" +#include "deprecated/CCNotificationCenter.h" + +using namespace Platform; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::Graphics::Display; +using namespace Windows::UI::Input; +using namespace Windows::UI::Core; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::System; +using namespace Windows::UI::ViewManagement; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Core; +using namespace Windows::ApplicationModel::Activation; +using namespace Platform; +using namespace Microsoft::WRL; +using namespace PhoneDirect3DXamlAppComponent; + + +NS_CC_BEGIN + +static GLViewImpl* s_pEglView = NULL; + +GLViewImpl* GLViewImpl::create(const std::string& viewName) +{ + auto ret = new GLViewImpl; + if(ret && ret->initWithFullScreen(viewName)) + { + ret->autorelease(); + return ret; + } + + return nullptr; +} + + +GLViewImpl::GLViewImpl() + : _frameZoomFactor(1.0f) + , _supportTouch(true) + , _isRetina(false) + , m_lastPointValid(false) + , m_running(false) + , m_initialized(false) + , m_windowClosed(false) + , m_windowVisible(true) + , m_width(0) + , m_height(0) + , m_delegate(nullptr) + , m_messageBoxDelegate(nullptr) + , m_orientation(DisplayOrientations::Landscape) +{ + s_pEglView = this; + _viewName = "cocos2dx"; +} + +GLViewImpl::~GLViewImpl() +{ + CC_ASSERT(this == s_pEglView); + s_pEglView = NULL; + + // TODO: cleanup +} + +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +{ + setViewName(viewName); + setFrameSize(rect.size.width, rect.size.height); + setFrameZoomFactor(frameZoomFactor); + return true; +} + +bool GLViewImpl::initWithFullScreen(const std::string& viewName) +{ + return initWithRect(viewName, Rect(0, 0, m_width, m_height), 1.0f); +} + + +bool GLViewImpl::Create(float width, float height, DisplayOrientations orientation) +{ + m_orientation = orientation; + UpdateForWindowSizeChange(width, height); + return true; +} + + + +void GLViewImpl::setIMEKeyboardState(bool bOpen) +{ + std::string str; + setIMEKeyboardState(bOpen, str); +} + +void GLViewImpl::setIMEKeyboardState(bool bOpen, std::string str) +{ + if(m_delegate) + { + if(bOpen) + { + m_delegate->Invoke(Cocos2dEvent::ShowKeyboard, stringToPlatformString(str)); + } + else + { + m_delegate->Invoke(Cocos2dEvent::HideKeyboard, stringToPlatformString(str)); + } + } +} + +Platform::String^ GLViewImpl::stringToPlatformString(std::string strSrc) +{ + // to wide char + int strLen = MultiByteToWideChar(CP_UTF8, 0, strSrc.c_str(), -1, NULL, 0); + wchar_t* wstr = new wchar_t[strLen + 1]; + memset(wstr, 0, strLen + 1); + MultiByteToWideChar(CP_UTF8, 0, strSrc.c_str(), -1, wstr, strLen); + Platform::String^ strDst = ref new Platform::String(wstr); + delete[] wstr; + return strDst; +} + +void GLViewImpl::swapBuffers() +{ + //eglSwapBuffers(m_eglDisplay, m_eglSurface); +} + + +bool GLViewImpl::isOpenGLReady() +{ + return true; + // TODO: need to revisit this + //return (m_eglDisplay && m_orientation != DisplayOrientations::None); +} + +void GLViewImpl::end() +{ + m_windowClosed = true; +} + + +void GLViewImpl::OnSuspending(Platform::Object^ sender, SuspendingEventArgs^ args) +{ +} + +void GLViewImpl::OnResuming(Platform::Object^ sender, Platform::Object^ args) +{ +} + +// user pressed the Back Key on the phone +void GLViewImpl::OnBackKeyPress() +{ + std::string str; + if(m_delegate) + { + m_delegate->Invoke(Cocos2dEvent::TerminateApp, stringToPlatformString(str)); + } +} + +void GLViewImpl::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args) +{ + OnPointerPressed(args); +} + +void GLViewImpl::OnPointerPressed(PointerEventArgs^ args) +{ + int id = args->CurrentPoint->PointerId; + Vec2 pt = GetPoint(args); + handleTouchesBegin(1, &id, &pt.x, &pt.y); +} + + +void GLViewImpl::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ args) +{ + float direction = (float)args->CurrentPoint->Properties->MouseWheelDelta; + int id = 0; + Vec2 p(0.0f,0.0f); + handleTouchesBegin(1, &id, &p.x, &p.y); + p.y += direction; + handleTouchesMove(1, &id, &p.x, &p.y); + handleTouchesEnd(1, &id, &p.x, &p.y); +} + +void GLViewImpl::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args) +{ + m_windowVisible = args->Visible; +} + +void GLViewImpl::OnWindowClosed(CoreWindow^ sender, CoreWindowEventArgs^ args) +{ + m_windowClosed = true; +} + +void GLViewImpl::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args) +{ + OnPointerMoved(args); +} + +void GLViewImpl::OnPointerMoved( PointerEventArgs^ args) +{ + auto currentPoint = args->CurrentPoint; + if (currentPoint->IsInContact) + { + if (m_lastPointValid) + { + int id = args->CurrentPoint->PointerId; + Vec2 p = GetPoint(args); + handleTouchesMove(1, &id, &p.x, &p.y); + } + m_lastPoint = currentPoint->Position; + m_lastPointValid = true; + } + else + { + m_lastPointValid = false; + } +} + +void GLViewImpl::OnPointerReleased(CoreWindow^ sender, PointerEventArgs^ args) +{ + OnPointerReleased(args); +} + +void GLViewImpl::OnPointerReleased(PointerEventArgs^ args) +{ + int id = args->CurrentPoint->PointerId; + Vec2 pt = GetPoint(args); + handleTouchesEnd(1, &id, &pt.x, &pt.y); +} + + + +void GLViewImpl::resize(int width, int height) +{ + +} + +void GLViewImpl::setFrameZoomFactor(float fZoomFactor) +{ + _frameZoomFactor = fZoomFactor; + Director::getInstance()->setProjection(Director::getInstance()->getProjection()); + //resize(m_obScreenSize.width * fZoomFactor, m_obScreenSize.height * fZoomFactor); +} + +float GLViewImpl::getFrameZoomFactor() +{ + return _frameZoomFactor; +} + +void GLViewImpl::centerWindow() +{ + // not implemented in WinRT. Window is always full screen +} + +GLViewImpl* GLViewImpl::sharedOpenGLView() +{ + return s_pEglView; +} + +int GLViewImpl::Run() +{ + // XAML version does not have a run loop + m_running = true; + return 0; +}; + +void GLViewImpl::Render() +{ + OnRendering(); +} + +void GLViewImpl::OnRendering() +{ + if(m_running && m_initialized) + { + Director::getInstance()->mainLoop(); + } +} + + + +bool GLViewImpl::ShowMessageBox(Platform::String^ title, Platform::String^ message) +{ + if(m_messageBoxDelegate) + { + m_messageBoxDelegate->Invoke(title, message); + return true; + } + return false; +} + +bool GLViewImpl::OpenXamlEditBox(Platform::String^ strPlaceHolder, Platform::String^ strText, int maxLength, int inputMode, int inputFlag, Windows::Foundation::EventHandler^ receiveHandler) +{ + if(m_editBoxDelegate) + { + m_editBoxDelegate->Invoke(strPlaceHolder, strText, maxLength, inputMode, inputFlag, receiveHandler); + return true; + } + return false; +} + + + +// called by orientation change from WP8 XAML +void GLViewImpl::UpdateOrientation(DisplayOrientations orientation) +{ + if(m_orientation != orientation) + { + m_orientation = orientation; + UpdateWindowSize(); + } +} + +// called by size change from WP8 XAML +void GLViewImpl::UpdateForWindowSizeChange(float width, float height) +{ + m_width = width; + m_height = height; + UpdateWindowSize(); +} + +#if 0 +win32 version + +void GLViewEventHandler::OnGLFWWindowSizeFunCallback(GLFWwindow *windows, int width, int height) +{ + auto view = Director::getInstance()->getOpenGLView(); + if(view && view->getResolutionPolicy() != ResolutionPolicy::UNKNOWN) + { + Size resSize=view->getDesignResolutionSize(); + ResolutionPolicy resPolicy=view->getResolutionPolicy(); + view->setFrameSize(width, height); + view->setDesignResolutionSize(resSize.width, resSize.height, resPolicy); + Director::getInstance()->setViewport(); + } +} +#endif + +void GLViewImpl::UpdateWindowSize() +{ + float width, height; + + if(m_orientation == DisplayOrientations::Landscape || m_orientation == DisplayOrientations::LandscapeFlipped) + { + width = m_height; + height = m_width; + } + else + { + width = m_width; + height = m_height; + } + + UpdateOrientationMatrix(); + + //CCSize designSize = getDesignResolutionSize(); + if(!m_initialized) + { + m_initialized = true; + GLView::setFrameSize(width, height); + } + + auto view = Director::getInstance()->getOpenGLView(); + if(view && view->getResolutionPolicy() != ResolutionPolicy::UNKNOWN) + { + Size resSize=view->getDesignResolutionSize(); + ResolutionPolicy resPolicy=view->getResolutionPolicy(); + view->setFrameSize(width, height); + view->setDesignResolutionSize(resSize.width, resSize.height, resPolicy); + Director::getInstance()->setViewport(); + Director::sharedDirector()->setProjection(Director::sharedDirector()->getProjection()); + } +} + +const Mat4& GLViewImpl::getOrientationMatrix() const +{ + return m_orientationMatrix; +}; + + +void GLViewImpl::UpdateOrientationMatrix() +{ + kmMat4Identity(&m_orientationMatrix); + kmMat4Identity(&m_reverseOrientationMatrix); + switch(m_orientation) + { + case Windows::Graphics::Display::DisplayOrientations::PortraitFlipped: + kmMat4RotationZ(&m_orientationMatrix, static_cast(M_PI)); + kmMat4RotationZ(&m_reverseOrientationMatrix, static_cast(-M_PI)); + break; + + case Windows::Graphics::Display::DisplayOrientations::Landscape: + kmMat4RotationZ(&m_orientationMatrix, static_cast(-M_PI_2)); + kmMat4RotationZ(&m_reverseOrientationMatrix, static_cast(M_PI_2)); + break; + + case Windows::Graphics::Display::DisplayOrientations::LandscapeFlipped: + kmMat4RotationZ(&m_orientationMatrix, static_cast(M_PI_2)); + kmMat4RotationZ(&m_reverseOrientationMatrix, static_cast(-M_PI_2)); + break; + + default: + break; + } +} + +cocos2d::Vec2 GLViewImpl::TransformToOrientation(Windows::Foundation::Point p) +{ + cocos2d::Vec2 returnValue; + + float x = p.X; + float y = p.Y; + + switch (m_orientation) + { + case DisplayOrientations::Portrait: + default: + returnValue = Vec2(x, y); + break; + case DisplayOrientations::Landscape: + returnValue = Vec2(y, m_width - x); + break; + case DisplayOrientations::PortraitFlipped: + returnValue = Vec2(m_width - x, m_height - y); + break; + case DisplayOrientations::LandscapeFlipped: + returnValue = Vec2(m_height - y, x); + break; + } + + float zoomFactor = GLViewImpl::sharedOpenGLView()->getFrameZoomFactor(); + if(zoomFactor > 0.0f) { + returnValue.x /= zoomFactor; + returnValue.y /= zoomFactor; + } + + // CCLOG("%.2f %.2f : %.2f %.2f", p.X, p.Y,returnValue.x, returnValue.y); + + return returnValue; +} + +Vec2 GLViewImpl::GetPoint(PointerEventArgs^ args) { + + return TransformToOrientation(args->CurrentPoint->Position); + +} + + +void GLViewImpl::setViewPortInPoints(float x , float y , float w , float h) +{ + switch(m_orientation) + { + case DisplayOrientations::Landscape: + case DisplayOrientations::LandscapeFlipped: + glViewport((GLint)(y * _scaleY + _viewPortRect.origin.y), + (GLint)(x * _scaleX + _viewPortRect.origin.x), + (GLsizei)(h * _scaleY), + (GLsizei)(w * _scaleX)); + break; + + default: + glViewport((GLint)(x * _scaleX + _viewPortRect.origin.x), + (GLint)(y * _scaleY + _viewPortRect.origin.y), + (GLsizei)(w * _scaleX), + (GLsizei)(h * _scaleY)); + } +} + +void GLViewImpl::setScissorInPoints(float x , float y , float w , float h) +{ + switch(m_orientation) + { + case DisplayOrientations::Landscape: + case DisplayOrientations::LandscapeFlipped: + glScissor((GLint)(y * _scaleX + _viewPortRect.origin.y), + (GLint)((_viewPortRect.size.width - ((x + w) * _scaleX)) + _viewPortRect.origin.x), + (GLsizei)(h * _scaleY), + (GLsizei)(w * _scaleX)); + break; + + default: + glScissor((GLint)(x * _scaleX + _viewPortRect.origin.x), + (GLint)(y * _scaleY + _viewPortRect.origin.y), + (GLsizei)(w * _scaleX), + (GLsizei)(h * _scaleY)); + } +} + +void GLViewImpl::QueueBackKeyPress() +{ + std::lock_guard guard(mMutex); + std::shared_ptr e(new BackButtonEvent()); + mInputEvents.push(e); +} + +void GLViewImpl::QueuePointerEvent(PointerEventType type, PointerEventArgs^ args) +{ + std::lock_guard guard(mMutex); + std::shared_ptr e(new PointerEvent(type, args)); + mInputEvents.push(e); +} + +void GLViewImpl::QueueEvent(std::shared_ptr& event) +{ + std::lock_guard guard(mMutex); + mInputEvents.push(event); +} + +void GLViewImpl::ProcessEvents() +{ + std::lock_guard guard(mMutex); + + while (!mInputEvents.empty()) + { + InputEvent* e = mInputEvents.front().get(); + e->execute(); + mInputEvents.pop(); + } +} + +NS_CC_END diff --git a/cocos/platform/winrt/CCGLViewImpl-winrt.h b/cocos/platform/winrt/CCGLViewImpl-winrt.h new file mode 100644 index 0000000000..e30672fb2a --- /dev/null +++ b/cocos/platform/winrt/CCGLViewImpl-winrt.h @@ -0,0 +1,183 @@ +/**************************************************************************** +Copyright (c) 2010 cocos2d-x.org +Copyright (c) Microsoft Open Technologies, Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#ifndef __CC_EGLVIEWIMPL_WINRT_H__ +#define __CC_EGLVIEWIMPL_WINRT_H__ + +#include "CCStdC.h" +#include "platform/CCCommon.h" +#include "platform/CCGLView.h" +#include "InputEvent.h" + + +#include + +#include +#include +#include +#include + +#include +#include + + +NS_CC_BEGIN + +class GLViewImpl; + + +class CC_DLL GLViewImpl : public GLView +{ +public: + static GLViewImpl* create(const std::string& viewName); + + /* override functions */ + virtual bool isOpenGLReady(); + virtual void end(); + virtual void swapBuffers(); + virtual void setViewPortInPoints(float x , float y , float w , float h); + virtual void setScissorInPoints(float x , float y , float w , float h); + const Mat4& getOrientationMatrix() const; + const Mat4& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; + + Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;}; + Size getRenerTargetSize() const { return Size(m_width, m_height); } + + virtual void setIMEKeyboardState(bool bOpen); + virtual void setIMEKeyboardState(bool bOpen, std::string str); + Platform::String^ stringToPlatformString(std::string strSrc); + void ShowKeyboard(Windows::Foundation::Rect r); + void HideKeyboard(Windows::Foundation::Rect r); + + // WP8 XAML app + virtual bool Create(float width, float height, Windows::Graphics::Display::DisplayOrientations orientation); + + void OnPointerPressed(Windows::UI::Core::PointerEventArgs^ args); + void OnPointerMoved(Windows::UI::Core::PointerEventArgs^ args); + void OnPointerReleased(Windows::UI::Core::PointerEventArgs^ args); + void OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args); + void OnPointerWheelChanged(Windows::UI::Core::CoreWindow^, Windows::UI::Core::PointerEventArgs^ args); + void OnPointerMoved(Windows::UI::Core::CoreWindow^, Windows::UI::Core::PointerEventArgs^ args); + void OnPointerReleased(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args); + void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args); + void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args); + void OnResuming(Platform::Object^ sender, Platform::Object^ args); + void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ args); + void OnBackKeyPress(); + + void QueueBackKeyPress(); + void QueuePointerEvent(PointerEventType type, Windows::UI::Core::PointerEventArgs^ args); + void GLViewImpl::QueueEvent(std::shared_ptr& event); + + void SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate) { m_delegate = delegate; }; + void SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate) { m_messageBoxDelegate = delegate; }; + void SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ delegate) { m_editBoxDelegate = delegate; }; + + bool ShowMessageBox(Platform::String^ title, Platform::String^ message); + bool OpenXamlEditBox(Platform::String^ strPlaceHolder, Platform::String^ strText, int maxLength, int inputMode, int inputFlag, Windows::Foundation::EventHandler^ receiveHandler); + + int Run(); + void Render(); + + void resize(int width, int height); + + float getFrameZoomFactor(); + void centerWindow(); + + void UpdateOrientation(Windows::Graphics::Display::DisplayOrientations orientation); + void UpdateForWindowSizeChange(float width, float height); + + // static function + /** + @brief get the shared main open gl window + */ + static GLViewImpl* sharedOpenGLView(); + + void ProcessEvents(); + void AddPointerEvent(PointerEventType type, Windows::UI::Core::PointerEventArgs^ args); + + + +protected: + GLViewImpl(); + virtual ~GLViewImpl(); + + bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); + bool initWithFullScreen(const std::string& viewName); + + /* + * Set zoom factor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop. + */ + void setFrameZoomFactor(float zoomFactor); + + inline bool isRetina() { return _isRetina; }; + + float _frameZoomFactor; + bool _supportTouch; + bool _isRetina; + + +private: + CC_DISALLOW_COPY_AND_ASSIGN(GLViewImpl); + + void OnRendering(); + void UpdateWindowSize(); + void UpdateOrientationMatrix(); + + cocos2d::Vec2 TransformToOrientation(Windows::Foundation::Point point); + cocos2d::Vec2 GetPoint(Windows::UI::Core::PointerEventArgs^ args); + + Windows::Foundation::Rect m_windowBounds; + Windows::Foundation::EventRegistrationToken m_eventToken; + Windows::Foundation::Point m_lastPoint; + + float m_width; + float m_height; + + Windows::Graphics::Display::DisplayOrientations m_orientation; + Windows::Foundation::Rect m_keyboardRect; + + bool m_lastPointValid; + bool m_windowClosed; + bool m_windowVisible; + Mat4 m_orientationMatrix; + Mat4 m_reverseOrientationMatrix; + + + bool m_running; + bool m_initialized; + + PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ m_delegate; + PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ m_messageBoxDelegate; + PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ m_editBoxDelegate; + + std::queue> mInputEvents; + std::mutex mMutex; + +}; + +NS_CC_END + +#endif // end of __CC_EGLVIEWIMPL_WINRT_H__ diff --git a/cocos/platform/winrt/CCGL_Angle.h b/cocos/platform/winrt/CCGL_Angle.h index 888eaeb930..04c8e88cd4 100644 --- a/cocos/platform/winrt/CCGL_Angle.h +++ b/cocos/platform/winrt/CCGL_Angle.h @@ -37,16 +37,13 @@ THE SOFTWARE. #include "GLES2/gl2ext.h" #include "winrtangle.h" #include "esUtil.h" -#include "ccMacros.h" +#include "base/ccMacros.h" #define GL_WRITE_ONLY_OES 0x88B9 #define GL_BUFFER_ACCESS_OES 0x88BB #define GL_BUFFER_MAPPED_OES 0x88BC #define GL_BUFFER_MAP_POINTER_OES 0x88BD -#define GL_BGRA GL_BGRA_EXT - -#define glClearDepth glClearDepthf inline void glGenVertexArrays(GLsizei n, GLuint *arrays) @@ -77,6 +74,5 @@ inline GLboolean glUnmapBuffer(GLenum targets) } #define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES -#define GL_WRITE_ONLY GL_WRITE_ONLY_OES #endif // __CCGL_ANGLE_H__ diff --git a/cocos/platform/winrt/CCPlatformDefine-winrt.h b/cocos/platform/winrt/CCPlatformDefine-winrt.h new file mode 100644 index 0000000000..81bf7cfd55 --- /dev/null +++ b/cocos/platform/winrt/CCPlatformDefine-winrt.h @@ -0,0 +1,50 @@ +/**************************************************************************** +Copyright (c) 2010-2013 cocos2d-x.org +Copyright (c) Microsoft Open Technologies, Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +#ifndef __CCPLATFORMDEFINE_H__ +#define __CCPLATFORMDEFINE_H__ + +#if defined(CC_STATIC) +#define CC_DLL +#else +#if defined(_USRDLL) +#define CC_DLL __declspec(dllexport) +#else /* use a DLL library */ +#define CC_DLL __declspec(dllimport) +#endif +#endif + + + +#include + +#if CC_DISABLE_ASSERT > 0 +#define CC_ASSERT(cond) +#else +#define CC_ASSERT(cond) assert(cond) +#endif +#define CC_UNUSED_PARAM(unusedparam) (void)unusedparam + + +#endif /* __CCPLATFORMDEFINE_H__*/ diff --git a/cocos/platform/winrt/CCStdC.h b/cocos/platform/winrt/CCStdC.h index f86549779b..ebb6375854 100644 --- a/cocos/platform/winrt/CCStdC.h +++ b/cocos/platform/winrt/CCStdC.h @@ -83,17 +83,6 @@ typedef SSIZE_T ssize_t; #include -// Structure timeval has define in winsock.h, include windows.h for it. -#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 -#define _WINSOCKAPI_ -#include -#elif CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif - -#include - #ifdef WINRT_NO_WINSOCK #undef timeval struct timeval @@ -101,8 +90,15 @@ struct timeval long tv_sec; // seconds long tv_usec; // microSeconds }; -#endif // WINRT_NO_WINSOCK -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WP8 +#else +// Structure timeval has define in winsock.h, include windows.h for it. +#define _WINSOCKAPI_ +#include +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#include +#endif +#endif struct timezone { diff --git a/cocos/platform/winrt/CCWinRTUtils.cpp b/cocos/platform/winrt/CCWinRTUtils.cpp index c025fbb9ef..d7eabc25be 100644 --- a/cocos/platform/winrt/CCWinRTUtils.cpp +++ b/cocos/platform/winrt/CCWinRTUtils.cpp @@ -115,6 +115,7 @@ float getScaledDPIValue(float v) { void CC_DLL CCLogIPAddresses() { +#ifndef WP8_SHADER_COMPILER auto hostnames = NetworkInformation::GetHostNames(); int length = hostnames->Size; @@ -127,6 +128,7 @@ void CC_DLL CCLogIPAddresses() CCLog("IP Address: %s:", s.c_str()); } } +#endif } std::string CC_DLL getDeviceIPAddresses() diff --git a/cocos/platform/winrt/InputEvent.cpp b/cocos/platform/winrt/InputEvent.cpp index 2389dbd28d..1c647538a0 100644 --- a/cocos/platform/winrt/InputEvent.cpp +++ b/cocos/platform/winrt/InputEvent.cpp @@ -24,7 +24,13 @@ THE SOFTWARE. ****************************************************************************/ #include "InputEvent.h" -#include "CCGLViewImpl.h" + +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 +#include "CCGLViewImpl-wp8.h" +#else +#include "CCGLViewImpl-winrt.h" +#endif + #include "base/CCEventAcceleration.h" NS_CC_BEGIN diff --git a/cocos/platform/winrt/InputEvent.h b/cocos/platform/winrt/InputEvent.h index f8cbcdf664..ed22daf21f 100644 --- a/cocos/platform/winrt/InputEvent.h +++ b/cocos/platform/winrt/InputEvent.h @@ -48,7 +48,7 @@ enum PointerEventType PointerReleased, }; -class InputEvent +class CC_DLL InputEvent { public: InputEvent() {}; @@ -57,7 +57,7 @@ public: }; -class AccelerometerEvent : public InputEvent +class CC_DLL AccelerometerEvent : public InputEvent { public: AccelerometerEvent(const cocos2d::Acceleration& event); @@ -67,7 +67,7 @@ private: cocos2d::Acceleration m_event; }; -class PointerEvent : public InputEvent +class CC_DLL PointerEvent : public InputEvent { public: PointerEvent(PointerEventType type, Windows::UI::Core::PointerEventArgs^ args); @@ -79,7 +79,7 @@ private: Platform::Agile m_args; }; -class KeyboardEvent : public InputEvent +class CC_DLL KeyboardEvent : public InputEvent { public: @@ -92,14 +92,14 @@ private: Platform::Agile m_text; }; -class BackButtonEvent : public InputEvent +class CC_DLL BackButtonEvent : public InputEvent { public: BackButtonEvent(); virtual void execute(); }; -class CustomInputEvent : public InputEvent +class CC_DLL CustomInputEvent : public InputEvent { public: CustomInputEvent(const std::function&); diff --git a/cocos/platform/winrt/pch.h b/cocos/platform/winrt/pch.h index 5e0bbb907c..5dbe96eb9f 100644 --- a/cocos/platform/winrt/pch.h +++ b/cocos/platform/winrt/pch.h @@ -1,3 +1,11 @@ #pragma once +#include "targetver.h" + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include #include "cocos2d.h" +#include "cocos-ext.h" \ No newline at end of file diff --git a/cocos/platform/winrt/targetver.h b/cocos/platform/winrt/targetver.h new file mode 100644 index 0000000000..a66ecb00f1 --- /dev/null +++ b/cocos/platform/winrt/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp index 608cc6f828..d0d5a5f61c 100644 --- a/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp +++ b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "Cocos2dRenderer.h" #include "cocos2d.h" #include "CCApplication.h" -#include "CCGLViewImpl.h" +#include "CCGLViewImpl-wp8.h" #include "AppDelegate.h" #include @@ -56,11 +56,11 @@ void Cocos2dRenderer::CreateGLResources() GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height,m_orientation); director->setOpenGLView(glview); - CCApplication::getInstance()->run(); glview->SetXamlEventDelegate(m_delegate); glview->SetXamlMessageBoxDelegate(m_messageBoxDelegate); glview->SetXamlEditBoxDelegate(m_editBoxDelegate); - } + CCApplication::getInstance()->run(); + } else { cocos2d::GL::invalidateStateCache(); @@ -71,7 +71,7 @@ void Cocos2dRenderer::CreateGLResources() director->getEventDispatcher()->dispatchEvent(&recreatedEvent); cocos2d::Application::getInstance()->applicationWillEnterForeground(); director->setGLDefaultValues(); - } + } m_loadingComplete = true; } diff --git a/cocos/platform/wp8/CCGLViewImpl-wp8.cpp b/cocos/platform/wp8/CCGLViewImpl-wp8.cpp index 8eaa3f7314..1f4ef9d887 100644 --- a/cocos/platform/wp8/CCGLViewImpl-wp8.cpp +++ b/cocos/platform/wp8/CCGLViewImpl-wp8.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLViewImpl.h" +#include "CCGLViewImpl-wp8.h" #include "deprecated/CCSet.h" #include "base/ccMacros.h" #include "base/CCDirector.h" diff --git a/cocos/platform/wp8/pch.cpp b/cocos/platform/wp8/pch.cpp deleted file mode 100644 index bcb5590be1..0000000000 --- a/cocos/platform/wp8/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/cocos/platform/wp8/pch.h b/cocos/platform/wp8/pch.h deleted file mode 100644 index 5e0bbb907c..0000000000 --- a/cocos/platform/wp8/pch.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "cocos2d.h" diff --git a/cocos/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h index 51da7437e0..27483e863c 100644 --- a/cocos/platform/wp8/shaders/precompiledshaders.h +++ b/cocos/platform/wp8/shaders/precompiledshaders.h @@ -86,7 +86,7 @@ const unsigned char s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, 32, 219, 67, 19, @@ -456,7 +456,7 @@ const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 164, 4, 0, 0, 0, 0, 0, 0, -194, 137, 0, 0, 0, 0, 0, 0, +107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, @@ -800,7 +800,7 @@ const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 208, 7, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 65, 106, 69, 173, 111, 248, 97, 165, 186, 90, @@ -1215,6 +1215,1135 @@ const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { 111, 110, 0, 171, 171, 171, }; +const unsigned char s_2CF9793879165058483EFB4AD6FA9746ECD7DD2A[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 80, 139, + 0, 0, 10, 0, 0, 0, 97, 95, +116, 101, 120, 67, 111, 111, 114, 100, + 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 81, 139, 0, 0, 8, 0, 0, 0, + 97, 95, 110, 111, 114, 109, 97, 108, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 17, 0, 0, 0, 92, 139, 0, + 0, 242, 141, 0, 0, 11, 0, 0, + 0, 67, 67, 95, 77, 86, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 91, 139, 0, 0, +242, 141, 0, 0, 15, 0, 0, 0, + 67, 67, 95, 78, 111, 114, 109, 97, +108, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 255, 255, 255, 255, 4, + 0, 0, 0, 3, 0, 0, 0, 92, +139, 0, 0, 242, 141, 0, 0, 10, + 0, 0, 0, 67, 67, 95, 80, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 7, 0, 0, + 0, 4, 0, 0, 0, 81, 139, 0, + 0, 242, 141, 0, 0, 26, 0, 0, + 0, 117, 95, 80, 111, 105, 110, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 80, 111, 115, 105, 116, +105, 111, 110, 1, 0, 0, 0, 255, +255, 255, 255, 11, 0, 0, 0, 1, + 0, 0, 0, 81, 139, 0, 0, 242, +141, 0, 0, 25, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 80, 111, 115, 105, 116, 105, 111, 110, + 1, 0, 0, 0, 255, 255, 255, 255, + 12, 0, 0, 0, 1, 0, 0, 0, + 94, 139, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 81, +139, 0, 0, 241, 141, 0, 0, 25, + 0, 0, 0, 117, 95, 65, 109, 98, +105, 101, 110, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 67, +111, 108, 111, 114, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 81, 139, 0, 0, +241, 141, 0, 0, 21, 0, 0, 0, +117, 95, 68, 105, 114, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 1, 0, 0, + 0, 1, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 81, 139, 0, + 0, 241, 141, 0, 0, 25, 0, 0, + 0, 117, 95, 68, 105, 114, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 68, 105, 114, 101, 99, 116, 105, +111, 110, 1, 0, 0, 0, 2, 0, + 0, 0, 255, 255, 255, 255, 1, 0, + 0, 0, 81, 139, 0, 0, 241, 141, + 0, 0, 23, 0, 0, 0, 117, 95, + 80, 111, 105, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 1, 0, 0, + 0, 3, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 6, 20, 0, + 0, 241, 141, 0, 0, 30, 0, 0, + 0, 117, 95, 80, 111, 105, 110, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 82, 97, 110, 103, 101, + 73, 110, 118, 101, 114, 115, 101, 1, + 0, 0, 0, 4, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 81, +139, 0, 0, 241, 141, 0, 0, 22, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 67, 111, 108, 111, +114, 1, 0, 0, 0, 5, 0, 0, + 0, 255, 255, 255, 255, 1, 0, 0, + 0, 81, 139, 0, 0, 241, 141, 0, + 0, 26, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 68, 105, +114, 101, 99, 116, 105, 111, 110, 1, + 0, 0, 0, 6, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 6, + 20, 0, 0, 241, 141, 0, 0, 30, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 73, 110, 110, 101, +114, 65, 110, 103, 108, 101, 67, 111, +115, 1, 0, 0, 0, 7, 0, 0, + 0, 255, 255, 255, 255, 1, 0, 0, + 0, 6, 20, 0, 0, 241, 141, 0, + 0, 30, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 79, 117, +116, 101, 114, 65, 110, 103, 108, 101, + 67, 111, 115, 1, 0, 0, 0, 8, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 6, 20, 0, 0, 241, +141, 0, 0, 29, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 82, 97, 110, 103, 101, 73, 110, 118, +101, 114, 115, 101, 1, 0, 0, 0, + 9, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 82, 139, 0, 0, +241, 141, 0, 0, 7, 0, 0, 0, +117, 95, 99, 111, 108, 111, 114, 0, + 0, 0, 0, 10, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 17, + 0, 0, 0, 11, 0, 0, 0, 67, + 67, 95, 77, 86, 77, 97, 116, 114, +105, 120, 0, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 67, 67, + 95, 78, 111, 114, 109, 97, 108, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 1, 0, 0, 0, 10, 0, 0, + 0, 67, 67, 95, 80, 77, 97, 116, +114, 105, 120, 0, 0, 0, 0, 2, + 0, 0, 0, 26, 0, 0, 0, 117, + 95, 80, 111, 105, 110, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 80, 111, 115, 105, 116, 105, 111, +110, 0, 0, 0, 0, 3, 0, 0, + 0, 25, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 80, 111, +115, 105, 116, 105, 111, 110, 0, 0, + 0, 0, 4, 0, 0, 0, 11, 0, + 0, 0, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 0, 0, + 0, 5, 0, 0, 0, 25, 0, 0, + 0, 117, 95, 65, 109, 98, 105, 101, +110, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 67, 111, 108, +111, 114, 0, 0, 0, 0, 6, 0, + 0, 0, 21, 0, 0, 0, 117, 95, + 68, 105, 114, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 67, 111, +108, 111, 114, 0, 0, 0, 0, 7, + 0, 0, 0, 25, 0, 0, 0, 117, + 95, 68, 105, 114, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 68, +105, 114, 101, 99, 116, 105, 111, 110, + 0, 0, 0, 0, 8, 0, 0, 0, + 23, 0, 0, 0, 117, 95, 80, 111, +105, 110, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 67, 111, +108, 111, 114, 0, 0, 0, 0, 9, + 0, 0, 0, 30, 0, 0, 0, 117, + 95, 80, 111, 105, 110, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 82, 97, 110, 103, 101, 73, 110, +118, 101, 114, 115, 101, 0, 0, 0, + 0, 10, 0, 0, 0, 22, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, + 0, 0, 0, 11, 0, 0, 0, 26, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 68, 105, 114, 101, + 99, 116, 105, 111, 110, 0, 0, 0, + 0, 12, 0, 0, 0, 30, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 73, 110, 110, 101, 114, 65, +110, 103, 108, 101, 67, 111, 115, 0, + 0, 0, 0, 13, 0, 0, 0, 30, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 79, 117, 116, 101, +114, 65, 110, 103, 108, 101, 67, 111, +115, 0, 0, 0, 0, 14, 0, 0, + 0, 29, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 82, 97, +110, 103, 101, 73, 110, 118, 101, 114, +115, 101, 0, 0, 0, 0, 15, 0, + 0, 0, 7, 0, 0, 0, 117, 95, + 99, 111, 108, 111, 114, 0, 0, 0, + 0, 16, 0, 0, 0, 236, 16, 0, + 0, 124, 10, 0, 0, 0, 0, 0, + 0, 107, 155, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 88, 66, 67, 39, 224, 169, +185, 116, 156, 41, 157, 187, 9, 222, +142, 94, 217, 160, 100, 1, 0, 0, + 0, 236, 16, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 140, 3, 0, + 0, 144, 11, 0, 0, 12, 12, 0, + 0, 244, 15, 0, 0, 112, 16, 0, + 0, 65, 111, 110, 57, 76, 3, 0, + 0, 76, 3, 0, 0, 0, 2, 255, +255, 24, 3, 0, 0, 52, 0, 0, + 0, 1, 0, 40, 0, 0, 0, 52, + 0, 0, 0, 52, 0, 1, 0, 36, + 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 255, +255, 81, 0, 0, 5, 11, 0, 15, +160, 0, 0, 0, 0, 0, 0, 128, + 63, 0, 0, 0, 192, 0, 0, 64, + 64, 31, 0, 0, 2, 0, 0, 0, +128, 0, 0, 7, 176, 31, 0, 0, + 2, 0, 0, 0, 128, 1, 0, 7, +176, 31, 0, 0, 2, 0, 0, 0, +128, 2, 0, 7, 176, 31, 0, 0, + 2, 0, 0, 0, 128, 3, 0, 3, +176, 31, 0, 0, 2, 0, 0, 0, +144, 0, 8, 15, 160, 5, 0, 0, + 3, 0, 0, 7, 128, 1, 0, 228, +176, 4, 0, 0, 160, 8, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 228, +128, 0, 0, 228, 128, 2, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 0, +129, 11, 0, 85, 160, 11, 0, 0, + 3, 1, 0, 8, 128, 0, 0, 0, +128, 11, 0, 0, 160, 2, 0, 0, + 3, 0, 0, 7, 128, 2, 0, 228, +160, 2, 0, 228, 160, 36, 0, 0, + 2, 1, 0, 7, 128, 0, 0, 228, +128, 36, 0, 0, 2, 0, 0, 7, +128, 0, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 228, +128, 1, 0, 228, 129, 5, 0, 0, + 3, 1, 0, 7, 128, 0, 0, 255, +128, 1, 0, 228, 160, 88, 0, 0, + 4, 1, 0, 7, 128, 0, 0, 255, +128, 1, 0, 228, 128, 11, 0, 0, +160, 2, 0, 0, 3, 1, 0, 7, +128, 1, 0, 228, 128, 0, 0, 228, +160, 36, 0, 0, 2, 2, 0, 7, +128, 1, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 228, +128, 2, 0, 228, 128, 5, 0, 0, + 3, 2, 0, 7, 128, 0, 0, 255, +128, 3, 0, 228, 160, 88, 0, 0, + 4, 2, 0, 7, 128, 0, 0, 255, +128, 2, 0, 228, 128, 11, 0, 0, +160, 4, 0, 0, 4, 1, 0, 7, +128, 2, 0, 228, 128, 1, 0, 255, +128, 1, 0, 228, 128, 2, 0, 0, + 3, 2, 0, 7, 128, 6, 0, 228, +160, 6, 0, 228, 160, 36, 0, 0, + 2, 3, 0, 7, 128, 2, 0, 228, +128, 36, 0, 0, 2, 2, 0, 7, +128, 2, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 3, 0, 228, +128, 2, 0, 228, 129, 8, 0, 0, + 3, 1, 0, 8, 128, 0, 0, 228, +128, 2, 0, 228, 128, 2, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 255, +128, 8, 0, 0, 161, 1, 0, 0, + 2, 2, 0, 1, 128, 8, 0, 0, +160, 2, 0, 0, 3, 0, 0, 2, +128, 2, 0, 0, 129, 7, 0, 0, +160, 6, 0, 0, 2, 0, 0, 2, +128, 0, 0, 85, 128, 5, 0, 0, + 3, 0, 0, 17, 128, 0, 0, 85, +128, 0, 0, 0, 128, 4, 0, 0, + 4, 0, 0, 2, 128, 0, 0, 0, +128, 11, 0, 170, 160, 11, 0, 255, +160, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 0, +128, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 85, +128, 5, 0, 0, 3, 0, 0, 14, +128, 2, 0, 144, 176, 9, 0, 0, +160, 8, 0, 0, 3, 0, 0, 2, +128, 0, 0, 249, 128, 0, 0, 249, +128, 2, 0, 0, 3, 0, 0, 2, +128, 0, 0, 85, 129, 11, 0, 85, +160, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 85, +128, 88, 0, 0, 4, 0, 0, 1, +128, 0, 0, 85, 128, 0, 0, 0, +128, 11, 0, 0, 160, 5, 0, 0, + 3, 0, 0, 14, 128, 1, 0, 255, +128, 5, 0, 144, 160, 88, 0, 0, + 4, 0, 0, 14, 128, 1, 0, 255, +128, 0, 0, 228, 128, 11, 0, 0, +160, 4, 0, 0, 4, 0, 0, 7, +128, 0, 0, 249, 128, 0, 0, 0, +128, 1, 0, 228, 128, 66, 0, 0, + 3, 1, 0, 15, 128, 3, 0, 228, +176, 0, 8, 228, 160, 5, 0, 0, + 3, 1, 0, 15, 128, 1, 0, 228, +128, 10, 0, 228, 160, 1, 0, 0, + 2, 0, 0, 8, 128, 11, 0, 85, +160, 5, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 128, 1, 0, 228, +128, 1, 0, 0, 2, 0, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 1, 8, 15, 128, 0, 0, 228, +128, 1, 0, 0, 2, 2, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 3, 8, 15, 128, 0, 0, 228, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 252, 7, 0, 0, 64, 0, 0, + 0, 255, 1, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 11, 0, 0, 0, 90, 0, 0, + 3, 0, 96, 16, 0, 0, 0, 0, + 0, 88, 24, 0, 4, 0, 112, 16, + 0, 0, 0, 0, 0, 85, 85, 0, + 0, 98, 16, 0, 3, 114, 16, 16, + 0, 0, 0, 0, 0, 98, 16, 0, + 3, 114, 16, 16, 0, 1, 0, 0, + 0, 98, 16, 0, 3, 114, 16, 16, + 0, 2, 0, 0, 0, 98, 16, 0, + 3, 50, 16, 16, 0, 3, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 1, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 2, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 3, 0, 0, + 0, 104, 0, 0, 2, 4, 0, 0, + 0, 16, 0, 0, 7, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 68, 0, 0, + 5, 18, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 0, 0, 0, 0, 6, 0, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 0, 0, 0, + 9, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 2, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 68, 0, 0, + 5, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 1, 0, 0, 0, 246, 15, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 8, 130, 0, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 128, 65, 0, 0, + 0, 1, 0, 0, 0, 52, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 6, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 18, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 10, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 10, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 246, 15, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 30, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 56, 0, 0, 8, 114, 0, 16, + 0, 2, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 6, 128, 32, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 0, 0, 0, + 8, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 128, 63, 52, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 68, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 2, 0, 0, 0, 246, 15, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 52, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 56, 0, 0, + 8, 114, 0, 16, 0, 2, 0, 0, + 0, 246, 15, 16, 0, 1, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 54, 0, 0, + 5, 114, 0, 16, 0, 3, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 130, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 58, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 9, 114, 0, 16, + 0, 3, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 246, 15, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 3, 0, 0, 0, 30, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 22, 0, 0, 1, 56, 0, 0, + 8, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 6, 128, 32, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 0, 0, 0, 8, 130, 0, 16, + 0, 0, 0, 0, 0, 58, 0, 16, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 52, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 58, 0, 16, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 16, 0, 0, + 7, 18, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 68, 0, 0, 5, 18, 0, 16, + 0, 1, 0, 0, 0, 10, 0, 16, + 0, 1, 0, 0, 0, 56, 0, 0, + 7, 114, 0, 16, 0, 1, 0, 0, + 0, 6, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 0, 0, 0, 9, 114, 0, 16, + 0, 2, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 6, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 6, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 68, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 56, 0, 0, + 7, 114, 0, 16, 0, 2, 0, 0, + 0, 246, 15, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 16, 0, 0, 8, 130, 0, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 70, 2, 16, +128, 65, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 10, 18, 0, 16, + 0, 2, 0, 0, 0, 10, 128, 32, + 0, 0, 0, 0, 0, 7, 0, 0, + 0, 10, 128, 32, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, + 0, 0, 0, 0, 9, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 10, 128, 32, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 14, 0, 0, + 10, 18, 0, 16, 0, 2, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 128, + 63, 0, 0, 128, 63, 0, 0, 128, + 63, 0, 0, 128, 63, 10, 0, 16, + 0, 2, 0, 0, 0, 56, 32, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 9, 18, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 192, 1, 64, 0, + 0, 0, 0, 64, 64, 56, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 56, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 10, 0, 16, + 0, 2, 0, 0, 0, 56, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 16, 0, 0, 7, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 52, 0, 0, + 7, 18, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 56, 0, 0, 8, 114, 0, 16, + 0, 0, 0, 0, 0, 6, 0, 16, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 5, 0, 0, + 0, 54, 0, 0, 5, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 3, 0, 0, 0, 54, 0, 0, + 5, 18, 0, 16, 0, 2, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 1, 33, 0, 0, + 7, 34, 0, 16, 0, 2, 0, 0, + 0, 10, 0, 16, 0, 2, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 3, 0, 4, 3, 26, 0, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 9, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 246, 15, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 30, 0, 0, 7, 18, 0, 16, + 0, 2, 0, 0, 0, 10, 0, 16, + 0, 2, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 69, 0, 0, 9, 242, 0, 16, + 0, 0, 0, 0, 0, 70, 16, 16, + 0, 3, 0, 0, 0, 70, 126, 16, + 0, 0, 0, 0, 0, 0, 96, 16, + 0, 0, 0, 0, 0, 56, 0, 0, + 8, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 10, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 56, 0, 0, 7, 242, 0, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 1, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 0, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 2, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 62, 0, 0, + 1, 83, 84, 65, 84, 116, 0, 0, + 0, 75, 0, 0, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, + 0, 47, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 82, 68, 69, + 70, 224, 3, 0, 0, 1, 0, 0, + 0, 176, 0, 0, 0, 3, 0, 0, + 0, 28, 0, 0, 0, 0, 4, 255, +255, 0, 65, 0, 0, 172, 3, 0, + 0, 124, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 145, 0, 0, 0, 2, 0, 0, + 0, 5, 0, 0, 0, 4, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 1, 0, 0, 0, 13, 0, 0, + 0, 166, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 115, 97, 109, 112, 108, 101, 114, + 95, 95, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 116, 101, +120, 116, 117, 114, 101, 95, 95, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 36, 71, 108, 111, 98, + 97, 108, 115, 0, 171, 166, 0, 0, + 0, 11, 0, 0, 0, 200, 0, 0, + 0, 176, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 208, 1, 0, + 0, 0, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 236, 1, 0, + 0, 0, 0, 0, 0, 252, 1, 0, + 0, 16, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 20, 2, 0, + 0, 0, 0, 0, 0, 36, 2, 0, + 0, 32, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 64, 2, 0, + 0, 0, 0, 0, 0, 80, 2, 0, + 0, 48, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 108, 2, 0, + 0, 0, 0, 0, 0, 124, 2, 0, + 0, 64, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 156, 2, 0, + 0, 0, 0, 0, 0, 172, 2, 0, + 0, 80, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 196, 2, 0, + 0, 0, 0, 0, 0, 212, 2, 0, + 0, 96, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 240, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 112, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 32, 3, 0, + 0, 0, 0, 0, 0, 48, 3, 0, + 0, 128, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 80, 3, 0, + 0, 0, 0, 0, 0, 96, 3, 0, + 0, 144, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 128, 3, 0, + 0, 0, 0, 0, 0, 144, 3, 0, + 0, 160, 0, 0, 0, 16, 0, 0, + 0, 2, 0, 0, 0, 156, 3, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 65, 109, 98, 105, 101, 110, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 68, 105, 114, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 68, 105, 114, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 68, 105, 114, 101, 99, 116, +105, 111, 110, 0, 171, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 80, 111, 105, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 171, 171, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 82, 97, 110, 103, +101, 73, 110, 118, 101, 114, 115, 101, + 0, 0, 0, 3, 0, 1, 0, 1, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 83, 112, 111, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 67, 111, 108, 111, 114, + 0, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 83, 112, 111, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 68, 105, 114, 101, 99, +116, 105, 111, 110, 0, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 73, +110, 110, 101, 114, 65, 110, 103, 108, +101, 67, 111, 115, 0, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 79, +117, 116, 101, 114, 65, 110, 103, 108, +101, 67, 111, 115, 0, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 82, + 97, 110, 103, 101, 73, 110, 118, 101, +114, 115, 101, 0, 171, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 99, 111, 108, 111, 114, 0, 171, 171, +171, 1, 0, 3, 0, 1, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 77, 105, 99, 114, 111, 115, 111, +102, 116, 32, 40, 82, 41, 32, 72, + 76, 83, 76, 32, 83, 104, 97, 100, +101, 114, 32, 67, 111, 109, 112, 105, +108, 101, 114, 32, 54, 46, 51, 46, + 57, 54, 48, 48, 46, 49, 54, 51, + 56, 52, 0, 171, 171, 73, 83, 71, + 78, 116, 0, 0, 0, 4, 0, 0, + 0, 8, 0, 0, 0, 104, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 3, 3, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 171, 171, +171, 79, 83, 71, 78, 116, 0, 0, + 0, 4, 0, 0, 0, 8, 0, 0, + 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 15, 0, 0, + 0, 83, 86, 95, 84, 97, 114, 103, +101, 116, 0, 171, 171, 68, 88, 66, + 67, 106, 130, 90, 239, 10, 84, 211, + 59, 203, 2, 21, 174, 163, 154, 53, +193, 1, 0, 0, 0, 124, 10, 0, + 0, 6, 0, 0, 0, 56, 0, 0, + 0, 224, 2, 0, 0, 64, 7, 0, + 0, 188, 7, 0, 0, 120, 9, 0, + 0, 220, 9, 0, 0, 65, 111, 110, + 57, 160, 2, 0, 0, 160, 2, 0, + 0, 0, 2, 254, 255, 108, 2, 0, + 0, 52, 0, 0, 0, 1, 0, 36, + 0, 0, 0, 48, 0, 0, 0, 48, + 0, 0, 0, 36, 0, 1, 0, 48, + 0, 0, 0, 0, 0, 13, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 254, 255, 81, 0, 0, + 5, 0, 0, 15, 160, 0, 0, 125, + 67, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 81, 0, 0, + 5, 14, 0, 15, 160, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 128, + 63, 0, 0, 0, 63, 81, 0, 0, + 5, 15, 0, 15, 160, 0, 0, 128, + 63, 0, 0, 128, 191, 0, 0, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 5, 0, 0, 15, 240, 253, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 31, 0, 0, + 2, 5, 0, 0, 128, 0, 0, 15, +144, 31, 0, 0, 2, 5, 0, 1, +128, 1, 0, 15, 144, 31, 0, 0, + 2, 5, 0, 2, 128, 2, 0, 15, +144, 9, 0, 0, 3, 0, 0, 1, +128, 1, 0, 228, 160, 1, 0, 228, +144, 9, 0, 0, 3, 0, 0, 2, +128, 2, 0, 228, 160, 1, 0, 228, +144, 9, 0, 0, 3, 0, 0, 4, +128, 3, 0, 228, 160, 1, 0, 228, +144, 9, 0, 0, 3, 0, 0, 8, +128, 4, 0, 228, 160, 1, 0, 228, +144, 2, 0, 0, 3, 1, 0, 7, +128, 0, 0, 228, 129, 12, 0, 228, +160, 1, 0, 0, 2, 2, 0, 7, +128, 14, 0, 85, 160, 1, 0, 0, + 2, 1, 0, 8, 128, 14, 0, 85, +160, 38, 0, 0, 1, 0, 0, 228, +240, 45, 0, 3, 2, 1, 0, 255, +128, 14, 0, 170, 160, 2, 0, 0, + 3, 1, 0, 8, 128, 1, 0, 255, +128, 14, 0, 170, 160, 1, 0, 0, + 2, 2, 0, 7, 128, 1, 0, 228, +128, 39, 0, 0, 0, 1, 0, 0, + 2, 1, 0, 7, 224, 2, 0, 228, +128, 2, 0, 0, 3, 1, 0, 7, +128, 0, 0, 228, 129, 13, 0, 228, +160, 1, 0, 0, 2, 2, 0, 7, +128, 14, 0, 85, 160, 1, 0, 0, + 2, 1, 0, 8, 128, 14, 0, 85, +160, 38, 0, 0, 1, 0, 0, 228, +240, 45, 0, 3, 2, 1, 0, 255, +128, 14, 0, 170, 160, 2, 0, 0, + 3, 1, 0, 8, 128, 1, 0, 255, +128, 14, 0, 170, 160, 1, 0, 0, + 2, 2, 0, 7, 128, 1, 0, 228, +128, 39, 0, 0, 0, 1, 0, 0, + 2, 2, 0, 7, 224, 2, 0, 228, +128, 8, 0, 0, 3, 0, 0, 1, +224, 5, 0, 228, 160, 0, 0, 228, +144, 8, 0, 0, 3, 0, 0, 2, +224, 6, 0, 228, 160, 0, 0, 228, +144, 8, 0, 0, 3, 0, 0, 4, +224, 7, 0, 228, 160, 0, 0, 228, +144, 9, 0, 0, 3, 1, 0, 1, +128, 8, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 1, 0, 4, +128, 9, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 1, 0, 8, +128, 10, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 0, 0, 1, +128, 11, 0, 228, 160, 0, 0, 228, +128, 1, 0, 0, 2, 1, 0, 2, +128, 1, 0, 170, 129, 2, 0, 0, + 3, 0, 0, 2, 128, 0, 0, 0, +128, 1, 0, 255, 128, 5, 0, 0, + 3, 0, 0, 4, 192, 0, 0, 85, +128, 14, 0, 255, 160, 4, 0, 0, + 4, 0, 0, 3, 192, 0, 0, 0, +128, 0, 0, 228, 160, 1, 0, 228, +128, 4, 0, 0, 4, 3, 0, 3, +224, 2, 0, 228, 144, 15, 0, 228, +160, 15, 0, 226, 160, 1, 0, 0, + 2, 0, 0, 8, 192, 0, 0, 0, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 88, 4, 0, 0, 64, 0, 1, + 0, 22, 1, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 13, 0, 0, 0, 95, 0, 0, + 3, 114, 16, 16, 0, 0, 0, 0, + 0, 95, 0, 0, 3, 242, 16, 16, + 0, 1, 0, 0, 0, 95, 0, 0, + 3, 50, 16, 16, 0, 2, 0, 0, + 0, 101, 0, 0, 3, 114, 32, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 114, 32, 16, 0, 1, 0, 0, + 0, 101, 0, 0, 3, 114, 32, 16, + 0, 2, 0, 0, 0, 101, 0, 0, + 3, 50, 32, 16, 0, 3, 0, 0, + 0, 103, 0, 0, 4, 242, 32, 16, + 0, 4, 0, 0, 0, 1, 0, 0, + 0, 104, 0, 0, 2, 3, 0, 0, + 0, 105, 0, 0, 4, 0, 0, 0, + 0, 1, 0, 0, 0, 4, 0, 0, + 0, 105, 0, 0, 4, 1, 0, 0, + 0, 1, 0, 0, 0, 4, 0, 0, + 0, 54, 0, 0, 9, 114, 48, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 54, 0, 0, + 9, 114, 48, 32, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 17, 0, 0, 8, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 30, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 34, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 70, 30, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 66, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 2, 0, 0, + 0, 70, 30, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 130, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 70, 30, 16, 0, 1, 0, 0, + 0, 0, 0, 0, 9, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 2, 16, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 11, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 1, 33, 0, 0, + 7, 18, 0, 16, 0, 2, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 3, 0, 4, 3, 10, 0, 16, + 0, 2, 0, 0, 0, 54, 0, 0, + 6, 114, 48, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 30, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 22, 0, 0, 1, 0, 0, 0, + 9, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 12, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 18, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 10, 0, 16, 0, 2, 0, 0, + 0, 54, 0, 0, 6, 114, 48, 32, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 30, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 16, 0, 0, 8, 18, 32, 16, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 70, 18, 16, 0, 0, 0, 0, + 0, 16, 0, 0, 8, 34, 32, 16, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 5, 0, 0, + 0, 70, 18, 16, 0, 0, 0, 0, + 0, 16, 0, 0, 8, 66, 32, 16, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 6, 0, 0, + 0, 70, 18, 16, 0, 0, 0, 0, + 0, 17, 0, 0, 8, 18, 32, 16, + 0, 4, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 7, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 17, 0, 0, 8, 18, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 8, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 17, 0, 0, 8, 34, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 9, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 17, 0, 0, 8, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 10, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 6, 34, 32, 16, + 0, 4, 0, 0, 0, 10, 0, 16, +128, 65, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 7, 34, 0, 16, + 0, 0, 0, 0, 0, 10, 0, 16, + 0, 0, 0, 0, 0, 26, 0, 16, + 0, 1, 0, 0, 0, 56, 0, 0, + 7, 66, 32, 16, 0, 4, 0, 0, + 0, 26, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 63, 54, 0, 0, 6, 114, 32, 16, + 0, 1, 0, 0, 0, 70, 50, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 6, 114, 32, 16, + 0, 2, 0, 0, 0, 70, 50, 32, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 32, 16, + 0, 4, 0, 0, 0, 10, 0, 16, + 0, 0, 0, 0, 0, 50, 0, 0, + 15, 50, 32, 16, 0, 3, 0, 0, + 0, 70, 16, 16, 0, 2, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 128, + 63, 0, 0, 128, 191, 0, 0, 0, + 0, 0, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 128, + 63, 0, 0, 0, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 37, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 17, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 2, 0, 0, + 0, 6, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 180, 1, 0, + 0, 1, 0, 0, 0, 72, 0, 0, + 0, 1, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 254, 255, 0, 65, 0, + 0, 128, 1, 0, 0, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 36, 71, 108, +111, 98, 97, 108, 115, 0, 171, 171, +171, 60, 0, 0, 0, 5, 0, 0, + 0, 96, 0, 0, 0, 208, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 216, 0, 0, 0, 0, 0, 0, + 0, 64, 0, 0, 0, 2, 0, 0, + 0, 232, 0, 0, 0, 0, 0, 0, + 0, 248, 0, 0, 0, 64, 0, 0, + 0, 44, 0, 0, 0, 2, 0, 0, + 0, 12, 1, 0, 0, 0, 0, 0, + 0, 28, 1, 0, 0, 112, 0, 0, + 0, 64, 0, 0, 0, 2, 0, 0, + 0, 232, 0, 0, 0, 0, 0, 0, + 0, 40, 1, 0, 0, 176, 0, 0, + 0, 12, 0, 0, 0, 2, 0, 0, + 0, 68, 1, 0, 0, 0, 0, 0, + 0, 84, 1, 0, 0, 192, 0, 0, + 0, 12, 0, 0, 0, 2, 0, 0, + 0, 112, 1, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 77, 86, 77, + 97, 116, 114, 105, 120, 0, 171, 171, +171, 3, 0, 3, 0, 4, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 78, 111, 114, +109, 97, 108, 77, 97, 116, 114, 105, +120, 0, 171, 171, 171, 3, 0, 3, + 0, 3, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 95, 67, 67, + 95, 80, 77, 97, 116, 114, 105, 120, + 0, 95, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 80, 111, 115, 105, +116, 105, 111, 110, 0, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 80, +111, 115, 105, 116, 105, 111, 110, 0, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 77, 105, 99, 114, 111, 115, 111, +102, 116, 32, 40, 82, 41, 32, 72, + 76, 83, 76, 32, 83, 104, 97, 100, +101, 114, 32, 67, 111, 109, 112, 105, +108, 101, 114, 32, 54, 46, 51, 46, + 57, 54, 48, 48, 46, 49, 54, 51, + 56, 52, 0, 171, 171, 73, 83, 71, + 78, 92, 0, 0, 0, 3, 0, 0, + 0, 8, 0, 0, 0, 80, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 7, 7, 0, 0, 80, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 15, 15, 0, 0, 80, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 3, 3, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 171, 171, +171, 79, 83, 71, 78, 152, 0, 0, + 0, 5, 0, 0, 0, 8, 0, 0, + 0, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 3, 12, 0, + 0, 137, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 3, 0, 0, + 0, 4, 0, 0, 0, 15, 0, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 83, 86, 95, 80, 111, 115, +105, 116, 105, 111, 110, 0, 171, 171, +171, +}; + const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { 166, 147, 0, 0, 142, 9, 2, 1, @@ -1301,7 +2430,7 @@ const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 24, 4, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 200, 5, 103, 205, 248, 30, 69, 65, 32, 117, @@ -1675,7 +2804,7 @@ const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { 86, 80, 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 16, 4, 0, 0, 48, 5, 0, 0, - 0, 0, 0, 0, 194, 137, 0, 0, + 0, 0, 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 79, 226, 72, 124, 94, 252, 37, 157, @@ -2070,7 +3199,7 @@ const unsigned char s_78250E25D1929D4A842050738140787BE42541C6[] = { 108, 112, 104, 97, 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 4, 5, - 0, 0, 0, 0, 0, 0, 194, 137, + 0, 0, 0, 0, 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, @@ -2485,7 +3614,7 @@ const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = { 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 194, 137, + 0, 0, 0, 0, 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, @@ -2869,7 +3998,7 @@ const unsigned char s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 192, 4, 0, 0, 0, 0, 0, - 0, 194, 137, 0, 0, 0, 0, 0, + 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -3250,7 +4379,7 @@ const unsigned char s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C[] = { 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 1, 0, 0, 0, 52, 3, 0, 0, 40, 4, 0, 0, 0, - 0, 0, 0, 194, 137, 0, 0, 0, + 0, 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 153, 8, 62, 201, 202, 170, 111, 182, 149, @@ -3584,7 +4713,7 @@ const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = { 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 4, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -194, 137, 0, 0, 0, 0, 0, 0, +107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 134, 66, 128, 226, 107, 172, 247, 161, 241, 207, 89, 240, @@ -4001,7 +5130,7 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 0, 5, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, 177, 78, 120, 99, @@ -4330,6 +5459,1070 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 111, 110, 0, 171, 171, 171, }; +const unsigned char s_93D31E1668075AE4941C53441D7A9D0DE8F76331[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 80, 139, + 0, 0, 10, 0, 0, 0, 97, 95, +116, 101, 120, 67, 111, 111, 114, 100, + 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 81, 139, 0, 0, 8, 0, 0, 0, + 97, 95, 110, 111, 114, 109, 97, 108, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 92, 139, 0, + 0, 242, 141, 0, 0, 11, 0, 0, + 0, 67, 67, 95, 77, 86, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 91, 139, 0, 0, +242, 141, 0, 0, 15, 0, 0, 0, + 67, 67, 95, 78, 111, 114, 109, 97, +108, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 255, 255, 255, 255, 4, + 0, 0, 0, 3, 0, 0, 0, 92, +139, 0, 0, 242, 141, 0, 0, 10, + 0, 0, 0, 67, 67, 95, 80, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 7, 0, 0, + 0, 4, 0, 0, 0, 81, 139, 0, + 0, 242, 141, 0, 0, 26, 0, 0, + 0, 117, 95, 80, 111, 105, 110, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 80, 111, 115, 105, 116, +105, 111, 110, 1, 0, 0, 0, 255, +255, 255, 255, 11, 0, 0, 0, 1, + 0, 0, 0, 81, 139, 0, 0, 242, +141, 0, 0, 25, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 80, 111, 115, 105, 116, 105, 111, 110, + 1, 0, 0, 0, 255, 255, 255, 255, + 12, 0, 0, 0, 1, 0, 0, 0, + 81, 139, 0, 0, 241, 141, 0, 0, + 25, 0, 0, 0, 117, 95, 65, 109, + 98, 105, 101, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 81, 139, 0, + 0, 241, 141, 0, 0, 21, 0, 0, + 0, 117, 95, 68, 105, 114, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 67, 111, 108, 111, 114, 1, 0, + 0, 0, 1, 0, 0, 0, 255, 255, +255, 255, 1, 0, 0, 0, 81, 139, + 0, 0, 241, 141, 0, 0, 25, 0, + 0, 0, 117, 95, 68, 105, 114, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 68, 105, 114, 101, 99, 116, +105, 111, 110, 1, 0, 0, 0, 2, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 81, 139, 0, 0, 241, +141, 0, 0, 23, 0, 0, 0, 117, + 95, 80, 111, 105, 110, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 67, 111, 108, 111, 114, 1, 0, + 0, 0, 3, 0, 0, 0, 255, 255, +255, 255, 1, 0, 0, 0, 6, 20, + 0, 0, 241, 141, 0, 0, 30, 0, + 0, 0, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 82, 97, 110, 103, +101, 73, 110, 118, 101, 114, 115, 101, + 1, 0, 0, 0, 4, 0, 0, 0, +255, 255, 255, 255, 1, 0, 0, 0, + 81, 139, 0, 0, 241, 141, 0, 0, + 22, 0, 0, 0, 117, 95, 83, 112, +111, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 67, 111, 108, +111, 114, 1, 0, 0, 0, 5, 0, + 0, 0, 255, 255, 255, 255, 1, 0, + 0, 0, 81, 139, 0, 0, 241, 141, + 0, 0, 26, 0, 0, 0, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 68, +105, 114, 101, 99, 116, 105, 111, 110, + 1, 0, 0, 0, 6, 0, 0, 0, +255, 255, 255, 255, 1, 0, 0, 0, + 6, 20, 0, 0, 241, 141, 0, 0, + 30, 0, 0, 0, 117, 95, 83, 112, +111, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 73, 110, 110, +101, 114, 65, 110, 103, 108, 101, 67, +111, 115, 1, 0, 0, 0, 7, 0, + 0, 0, 255, 255, 255, 255, 1, 0, + 0, 0, 6, 20, 0, 0, 241, 141, + 0, 0, 30, 0, 0, 0, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 79, +117, 116, 101, 114, 65, 110, 103, 108, +101, 67, 111, 115, 1, 0, 0, 0, + 8, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 6, 20, 0, 0, +241, 141, 0, 0, 29, 0, 0, 0, +117, 95, 83, 112, 111, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 82, 97, 110, 103, 101, 73, 110, +118, 101, 114, 115, 101, 1, 0, 0, + 0, 9, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 82, 139, 0, + 0, 241, 141, 0, 0, 7, 0, 0, + 0, 117, 95, 99, 111, 108, 111, 114, + 0, 0, 0, 0, 10, 0, 0, 0, +255, 255, 255, 255, 1, 0, 0, 0, + 16, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 77, 86, 77, 97, 116, +114, 105, 120, 0, 0, 0, 0, 0, + 0, 0, 0, 15, 0, 0, 0, 67, + 67, 95, 78, 111, 114, 109, 97, 108, + 77, 97, 116, 114, 105, 120, 0, 0, + 0, 0, 1, 0, 0, 0, 10, 0, + 0, 0, 67, 67, 95, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, + 2, 0, 0, 0, 26, 0, 0, 0, +117, 95, 80, 111, 105, 110, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 80, 111, 115, 105, 116, 105, +111, 110, 0, 0, 0, 0, 3, 0, + 0, 0, 25, 0, 0, 0, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 80, +111, 115, 105, 116, 105, 111, 110, 0, + 0, 0, 0, 4, 0, 0, 0, 25, + 0, 0, 0, 117, 95, 65, 109, 98, +105, 101, 110, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 67, +111, 108, 111, 114, 0, 0, 0, 0, + 5, 0, 0, 0, 21, 0, 0, 0, +117, 95, 68, 105, 114, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 0, 0, + 0, 6, 0, 0, 0, 25, 0, 0, + 0, 117, 95, 68, 105, 114, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 68, 105, 114, 101, 99, 116, 105, +111, 110, 0, 0, 0, 0, 7, 0, + 0, 0, 23, 0, 0, 0, 117, 95, + 80, 111, 105, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 0, 0, + 0, 8, 0, 0, 0, 30, 0, 0, + 0, 117, 95, 80, 111, 105, 110, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 82, 97, 110, 103, 101, + 73, 110, 118, 101, 114, 115, 101, 0, + 0, 0, 0, 9, 0, 0, 0, 22, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 67, 111, 108, 111, +114, 0, 0, 0, 0, 10, 0, 0, + 0, 26, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 68, 105, +114, 101, 99, 116, 105, 111, 110, 0, + 0, 0, 0, 11, 0, 0, 0, 30, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 73, 110, 110, 101, +114, 65, 110, 103, 108, 101, 67, 111, +115, 0, 0, 0, 0, 12, 0, 0, + 0, 30, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 79, 117, +116, 101, 114, 65, 110, 103, 108, 101, + 67, 111, 115, 0, 0, 0, 0, 13, + 0, 0, 0, 29, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 82, 97, 110, 103, 101, 73, 110, 118, +101, 114, 115, 101, 0, 0, 0, 0, + 14, 0, 0, 0, 7, 0, 0, 0, +117, 95, 99, 111, 108, 111, 114, 0, + 0, 0, 0, 15, 0, 0, 0, 200, + 15, 0, 0, 216, 9, 0, 0, 0, + 0, 0, 0, 107, 155, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 68, 88, 66, 67, 136, +158, 207, 210, 174, 144, 71, 116, 248, +243, 16, 127, 98, 212, 174, 233, 1, + 0, 0, 0, 200, 15, 0, 0, 6, + 0, 0, 0, 56, 0, 0, 0, 80, + 3, 0, 0, 236, 10, 0, 0, 104, + 11, 0, 0, 232, 14, 0, 0, 76, + 15, 0, 0, 65, 111, 110, 57, 16, + 3, 0, 0, 16, 3, 0, 0, 0, + 2, 255, 255, 224, 2, 0, 0, 48, + 0, 0, 0, 1, 0, 36, 0, 0, + 0, 48, 0, 0, 0, 48, 0, 0, + 0, 36, 0, 0, 0, 48, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 0, + 0, 0, 0, 1, 2, 255, 255, 81, + 0, 0, 5, 11, 0, 15, 160, 0, + 0, 0, 0, 0, 0, 128, 63, 0, + 0, 0, 192, 0, 0, 64, 64, 31, + 0, 0, 2, 0, 0, 0, 128, 0, + 0, 7, 176, 31, 0, 0, 2, 0, + 0, 0, 128, 1, 0, 7, 176, 31, + 0, 0, 2, 0, 0, 0, 128, 2, + 0, 7, 176, 5, 0, 0, 3, 0, + 0, 7, 128, 1, 0, 228, 176, 4, + 0, 0, 160, 8, 0, 0, 3, 0, + 0, 1, 128, 0, 0, 228, 128, 0, + 0, 228, 128, 2, 0, 0, 3, 0, + 0, 1, 128, 0, 0, 0, 129, 11, + 0, 85, 160, 11, 0, 0, 3, 1, + 0, 8, 128, 0, 0, 0, 128, 11, + 0, 0, 160, 2, 0, 0, 3, 0, + 0, 7, 128, 2, 0, 228, 160, 2, + 0, 228, 160, 36, 0, 0, 2, 1, + 0, 7, 128, 0, 0, 228, 128, 36, + 0, 0, 2, 0, 0, 7, 128, 0, + 0, 228, 176, 8, 0, 0, 3, 0, + 0, 8, 128, 0, 0, 228, 128, 1, + 0, 228, 129, 5, 0, 0, 3, 1, + 0, 7, 128, 0, 0, 255, 128, 1, + 0, 228, 160, 88, 0, 0, 4, 1, + 0, 7, 128, 0, 0, 255, 128, 1, + 0, 228, 128, 11, 0, 0, 160, 2, + 0, 0, 3, 1, 0, 7, 128, 1, + 0, 228, 128, 0, 0, 228, 160, 36, + 0, 0, 2, 2, 0, 7, 128, 1, + 0, 228, 176, 8, 0, 0, 3, 0, + 0, 8, 128, 0, 0, 228, 128, 2, + 0, 228, 128, 5, 0, 0, 3, 2, + 0, 7, 128, 0, 0, 255, 128, 3, + 0, 228, 160, 88, 0, 0, 4, 2, + 0, 7, 128, 0, 0, 255, 128, 2, + 0, 228, 128, 11, 0, 0, 160, 4, + 0, 0, 4, 1, 0, 7, 128, 2, + 0, 228, 128, 1, 0, 255, 128, 1, + 0, 228, 128, 2, 0, 0, 3, 2, + 0, 7, 128, 6, 0, 228, 160, 6, + 0, 228, 160, 36, 0, 0, 2, 3, + 0, 7, 128, 2, 0, 228, 128, 36, + 0, 0, 2, 2, 0, 7, 128, 2, + 0, 228, 176, 8, 0, 0, 3, 0, + 0, 8, 128, 3, 0, 228, 128, 2, + 0, 228, 129, 8, 0, 0, 3, 1, + 0, 8, 128, 0, 0, 228, 128, 2, + 0, 228, 128, 2, 0, 0, 3, 0, + 0, 1, 128, 0, 0, 255, 128, 8, + 0, 0, 161, 1, 0, 0, 2, 2, + 0, 1, 128, 8, 0, 0, 160, 2, + 0, 0, 3, 0, 0, 2, 128, 2, + 0, 0, 129, 7, 0, 0, 160, 6, + 0, 0, 2, 0, 0, 2, 128, 0, + 0, 85, 128, 5, 0, 0, 3, 0, + 0, 17, 128, 0, 0, 85, 128, 0, + 0, 0, 128, 4, 0, 0, 4, 0, + 0, 2, 128, 0, 0, 0, 128, 11, + 0, 170, 160, 11, 0, 255, 160, 5, + 0, 0, 3, 0, 0, 1, 128, 0, + 0, 0, 128, 0, 0, 0, 128, 5, + 0, 0, 3, 0, 0, 1, 128, 0, + 0, 0, 128, 0, 0, 85, 128, 5, + 0, 0, 3, 0, 0, 14, 128, 2, + 0, 144, 176, 9, 0, 0, 160, 8, + 0, 0, 3, 0, 0, 2, 128, 0, + 0, 249, 128, 0, 0, 249, 128, 2, + 0, 0, 3, 0, 0, 2, 128, 0, + 0, 85, 129, 11, 0, 85, 160, 5, + 0, 0, 3, 0, 0, 1, 128, 0, + 0, 0, 128, 0, 0, 85, 128, 88, + 0, 0, 4, 0, 0, 1, 128, 0, + 0, 85, 128, 0, 0, 0, 128, 11, + 0, 0, 160, 5, 0, 0, 3, 0, + 0, 14, 128, 1, 0, 255, 128, 5, + 0, 144, 160, 88, 0, 0, 4, 0, + 0, 14, 128, 1, 0, 255, 128, 0, + 0, 228, 128, 11, 0, 0, 160, 4, + 0, 0, 4, 0, 0, 7, 128, 0, + 0, 249, 128, 0, 0, 0, 128, 1, + 0, 228, 128, 1, 0, 0, 2, 0, + 0, 8, 128, 11, 0, 85, 160, 5, + 0, 0, 3, 0, 0, 15, 128, 0, + 0, 228, 128, 10, 0, 228, 160, 1, + 0, 0, 2, 0, 8, 15, 128, 0, + 0, 228, 128, 1, 0, 0, 2, 1, + 8, 15, 128, 0, 0, 228, 128, 1, + 0, 0, 2, 2, 8, 15, 128, 0, + 0, 228, 128, 1, 0, 0, 2, 3, + 8, 15, 128, 0, 0, 228, 128, 255, +255, 0, 0, 83, 72, 68, 82, 148, + 7, 0, 0, 64, 0, 0, 0, 229, + 1, 0, 0, 89, 0, 0, 4, 70, +142, 32, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 98, 16, 0, 3, 114, + 16, 16, 0, 0, 0, 0, 0, 98, + 16, 0, 3, 114, 16, 16, 0, 1, + 0, 0, 0, 98, 16, 0, 3, 114, + 16, 16, 0, 2, 0, 0, 0, 101, + 0, 0, 3, 242, 32, 16, 0, 0, + 0, 0, 0, 101, 0, 0, 3, 242, + 32, 16, 0, 1, 0, 0, 0, 101, + 0, 0, 3, 242, 32, 16, 0, 2, + 0, 0, 0, 101, 0, 0, 3, 242, + 32, 16, 0, 3, 0, 0, 0, 104, + 0, 0, 2, 4, 0, 0, 0, 16, + 0, 0, 7, 18, 0, 16, 0, 0, + 0, 0, 0, 70, 18, 16, 0, 0, + 0, 0, 0, 70, 18, 16, 0, 0, + 0, 0, 0, 68, 0, 0, 5, 18, + 0, 16, 0, 0, 0, 0, 0, 10, + 0, 16, 0, 0, 0, 0, 0, 56, + 0, 0, 7, 114, 0, 16, 0, 0, + 0, 0, 0, 6, 0, 16, 0, 0, + 0, 0, 0, 70, 18, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 9, 114, + 0, 16, 0, 1, 0, 0, 0, 70, +130, 32, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 2, 0, 0, 0, 16, + 0, 0, 7, 130, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 1, + 0, 0, 0, 70, 2, 16, 0, 1, + 0, 0, 0, 68, 0, 0, 5, 130, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 0, 0, 0, 0, 56, + 0, 0, 7, 114, 0, 16, 0, 1, + 0, 0, 0, 246, 15, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 1, + 0, 0, 0, 16, 0, 0, 8, 130, + 0, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 128, 65, 0, 0, 0, 1, + 0, 0, 0, 52, 0, 0, 7, 130, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 0, 54, + 0, 0, 6, 114, 0, 16, 0, 1, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 130, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 0, 48, 0, 0, 1, 33, + 0, 0, 7, 18, 0, 16, 0, 2, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 3, 0, 4, 3, 10, + 0, 16, 0, 2, 0, 0, 0, 50, + 0, 0, 10, 114, 0, 16, 0, 1, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 246, + 15, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 30, + 0, 0, 7, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 22, 0, 0, 1, 56, + 0, 0, 8, 114, 0, 16, 0, 2, + 0, 0, 0, 70, 18, 16, 0, 1, + 0, 0, 0, 6, 128, 32, 0, 0, + 0, 0, 0, 4, 0, 0, 0, 16, + 0, 0, 7, 130, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 2, + 0, 0, 0, 70, 2, 16, 0, 2, + 0, 0, 0, 0, 0, 0, 8, 130, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 128, 65, 0, 0, 0, 0, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 128, 63, 52, 0, 0, 7, 130, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 7, 130, 0, 16, 0, 1, + 0, 0, 0, 70, 18, 16, 0, 1, + 0, 0, 0, 70, 18, 16, 0, 1, + 0, 0, 0, 68, 0, 0, 5, 130, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 56, + 0, 0, 7, 114, 0, 16, 0, 2, + 0, 0, 0, 246, 15, 16, 0, 1, + 0, 0, 0, 70, 18, 16, 0, 1, + 0, 0, 0, 16, 0, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 2, 0, 0, 0, 52, + 0, 0, 7, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 0, 56, 0, 0, 8, 114, + 0, 16, 0, 2, 0, 0, 0, 246, + 15, 16, 0, 1, 0, 0, 0, 70, +130, 32, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 54, 0, 0, 5, 114, + 0, 16, 0, 3, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 54, + 0, 0, 5, 130, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 0, 48, 0, 0, 1, 33, + 0, 0, 7, 130, 0, 16, 0, 2, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 3, 0, 4, 3, 58, + 0, 16, 0, 2, 0, 0, 0, 50, + 0, 0, 9, 114, 0, 16, 0, 3, + 0, 0, 0, 70, 2, 16, 0, 2, + 0, 0, 0, 246, 15, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 3, + 0, 0, 0, 30, 0, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 1, + 64, 0, 0, 1, 0, 0, 0, 22, + 0, 0, 1, 56, 0, 0, 8, 114, + 0, 16, 0, 1, 0, 0, 0, 70, + 18, 16, 0, 2, 0, 0, 0, 6, +128, 32, 0, 0, 0, 0, 0, 9, + 0, 0, 0, 16, 0, 0, 7, 130, + 0, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 0, + 0, 0, 8, 130, 0, 16, 0, 0, + 0, 0, 0, 58, 0, 16, 128, 65, + 0, 0, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 128, 63, 52, + 0, 0, 7, 130, 0, 16, 0, 0, + 0, 0, 0, 58, 0, 16, 0, 0, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 0, 16, 0, 0, 7, 18, + 0, 16, 0, 1, 0, 0, 0, 70, + 18, 16, 0, 2, 0, 0, 0, 70, + 18, 16, 0, 2, 0, 0, 0, 68, + 0, 0, 5, 18, 0, 16, 0, 1, + 0, 0, 0, 10, 0, 16, 0, 1, + 0, 0, 0, 56, 0, 0, 7, 114, + 0, 16, 0, 1, 0, 0, 0, 6, + 0, 16, 0, 1, 0, 0, 0, 70, + 18, 16, 0, 2, 0, 0, 0, 0, + 0, 0, 9, 114, 0, 16, 0, 2, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 70, +130, 32, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 16, 0, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 0, 2, 0, 0, 0, 70, + 2, 16, 0, 2, 0, 0, 0, 68, + 0, 0, 5, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 56, 0, 0, 7, 114, + 0, 16, 0, 2, 0, 0, 0, 246, + 15, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 0, 2, 0, 0, 0, 16, + 0, 0, 8, 130, 0, 16, 0, 1, + 0, 0, 0, 70, 2, 16, 0, 2, + 0, 0, 0, 70, 2, 16, 128, 65, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 10, 18, 0, 16, 0, 2, + 0, 0, 0, 10, 128, 32, 0, 0, + 0, 0, 0, 7, 0, 0, 0, 10, +128, 32, 128, 65, 0, 0, 0, 0, + 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 9, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 10, 128, 32, 128, 65, + 0, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 0, 14, 0, 0, 10, 18, + 0, 16, 0, 2, 0, 0, 0, 2, + 64, 0, 0, 0, 0, 128, 63, 0, + 0, 128, 63, 0, 0, 128, 63, 0, + 0, 128, 63, 10, 0, 16, 0, 2, + 0, 0, 0, 56, 32, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 10, + 0, 16, 0, 2, 0, 0, 0, 50, + 0, 0, 9, 18, 0, 16, 0, 2, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 192, 1, 64, 0, 0, 0, + 0, 64, 64, 56, 0, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 56, + 0, 0, 7, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 10, 0, 16, 0, 2, + 0, 0, 0, 56, 0, 0, 7, 130, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 16, + 0, 0, 7, 18, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 1, + 0, 0, 0, 52, 0, 0, 7, 18, + 0, 16, 0, 0, 0, 0, 0, 10, + 0, 16, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 0, 56, + 0, 0, 8, 114, 0, 16, 0, 0, + 0, 0, 0, 6, 0, 16, 0, 0, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 5, 0, 0, 0, 54, + 0, 0, 5, 114, 0, 16, 0, 1, + 0, 0, 0, 70, 2, 16, 0, 3, + 0, 0, 0, 54, 0, 0, 5, 18, + 0, 16, 0, 2, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 0, 48, + 0, 0, 1, 33, 0, 0, 7, 34, + 0, 16, 0, 2, 0, 0, 0, 10, + 0, 16, 0, 2, 0, 0, 0, 1, + 64, 0, 0, 1, 0, 0, 0, 3, + 0, 4, 3, 26, 0, 16, 0, 2, + 0, 0, 0, 50, 0, 0, 9, 114, + 0, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 0, 0, 0, 0, 0, 246, + 15, 16, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 30, + 0, 0, 7, 18, 0, 16, 0, 2, + 0, 0, 0, 10, 0, 16, 0, 2, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 22, 0, 0, 1, 54, + 0, 0, 5, 130, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 128, 63, 56, 0, 0, 8, 242, + 0, 16, 0, 0, 0, 0, 0, 70, + 14, 16, 0, 1, 0, 0, 0, 70, +142, 32, 0, 0, 0, 0, 0, 10, + 0, 0, 0, 54, 0, 0, 5, 242, + 32, 16, 0, 0, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 242, 32, 16, 0, 1, + 0, 0, 0, 70, 14, 16, 0, 0, + 0, 0, 0, 54, 0, 0, 5, 242, + 32, 16, 0, 2, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 242, 32, 16, 0, 3, + 0, 0, 0, 70, 14, 16, 0, 0, + 0, 0, 0, 62, 0, 0, 1, 83, + 84, 65, 84, 116, 0, 0, 0, 73, + 0, 0, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 7, 0, 0, 0, 46, + 0, 0, 0, 6, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 82, 68, 69, 70, 120, + 3, 0, 0, 1, 0, 0, 0, 72, + 0, 0, 0, 1, 0, 0, 0, 28, + 0, 0, 0, 0, 4, 255, 255, 0, + 65, 0, 0, 68, 3, 0, 0, 60, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 36, + 71, 108, 111, 98, 97, 108, 115, 0, +171, 171, 171, 60, 0, 0, 0, 11, + 0, 0, 0, 96, 0, 0, 0, 176, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 104, 1, 0, 0, 0, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 132, 1, 0, 0, 0, + 0, 0, 0, 148, 1, 0, 0, 16, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 172, 1, 0, 0, 0, + 0, 0, 0, 188, 1, 0, 0, 32, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 216, 1, 0, 0, 0, + 0, 0, 0, 232, 1, 0, 0, 48, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 4, 2, 0, 0, 0, + 0, 0, 0, 20, 2, 0, 0, 64, + 0, 0, 0, 4, 0, 0, 0, 2, + 0, 0, 0, 52, 2, 0, 0, 0, + 0, 0, 0, 68, 2, 0, 0, 80, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 92, 2, 0, 0, 0, + 0, 0, 0, 108, 2, 0, 0, 96, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 136, 2, 0, 0, 0, + 0, 0, 0, 152, 2, 0, 0, 112, + 0, 0, 0, 4, 0, 0, 0, 2, + 0, 0, 0, 184, 2, 0, 0, 0, + 0, 0, 0, 200, 2, 0, 0, 128, + 0, 0, 0, 4, 0, 0, 0, 2, + 0, 0, 0, 232, 2, 0, 0, 0, + 0, 0, 0, 248, 2, 0, 0, 144, + 0, 0, 0, 4, 0, 0, 0, 2, + 0, 0, 0, 24, 3, 0, 0, 0, + 0, 0, 0, 40, 3, 0, 0, 160, + 0, 0, 0, 16, 0, 0, 0, 2, + 0, 0, 0, 52, 3, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 65, 109, + 98, 105, 101, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 171, 1, + 0, 3, 0, 1, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 68, 105, 114, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 171, 1, + 0, 3, 0, 1, 0, 3, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 68, 105, 114, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 68, 105, 114, 101, 99, 116, 105, 111, +110, 0, 171, 1, 0, 3, 0, 1, + 0, 3, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 80, 111, +105, 110, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 67, 111, +108, 111, 114, 0, 171, 171, 171, 1, + 0, 3, 0, 1, 0, 3, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 80, 111, 105, 110, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 82, 97, 110, 103, 101, 73, +110, 118, 101, 114, 115, 101, 0, 0, + 0, 3, 0, 1, 0, 1, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 83, 112, 111, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 67, 111, 108, 111, 114, 0, 1, + 0, 3, 0, 1, 0, 3, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 83, 112, 111, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 68, 105, 114, 101, 99, 116, 105, +111, 110, 0, 1, 0, 3, 0, 1, + 0, 3, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 83, 112, +111, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 73, 110, 110, +101, 114, 65, 110, 103, 108, 101, 67, +111, 115, 0, 0, 0, 3, 0, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 83, 112, +111, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 79, 117, 116, +101, 114, 65, 110, 103, 108, 101, 67, +111, 115, 0, 0, 0, 3, 0, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 83, 112, +111, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 82, 97, 110, +103, 101, 73, 110, 118, 101, 114, 115, +101, 0, 171, 0, 0, 3, 0, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 95, 117, 95, 99, 111, +108, 111, 114, 0, 171, 171, 171, 1, + 0, 3, 0, 1, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 77, +105, 99, 114, 111, 115, 111, 102, 116, + 32, 40, 82, 41, 32, 72, 76, 83, + 76, 32, 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, 108, 101, +114, 32, 54, 46, 51, 46, 57, 54, + 48, 48, 46, 49, 54, 51, 56, 52, + 0, 171, 171, 73, 83, 71, 78, 92, + 0, 0, 0, 3, 0, 0, 0, 8, + 0, 0, 0, 80, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 7, + 7, 0, 0, 80, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 1, 0, 0, 0, 7, + 7, 0, 0, 80, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 2, 0, 0, 0, 7, + 7, 0, 0, 84, 69, 88, 67, 79, + 79, 82, 68, 0, 171, 171, 171, 79, + 83, 71, 78, 116, 0, 0, 0, 4, + 0, 0, 0, 8, 0, 0, 0, 104, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 15, 0, 0, 0, 104, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 1, + 0, 0, 0, 15, 0, 0, 0, 104, + 0, 0, 0, 2, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 2, + 0, 0, 0, 15, 0, 0, 0, 104, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 3, + 0, 0, 0, 15, 0, 0, 0, 83, + 86, 95, 84, 97, 114, 103, 101, 116, + 0, 171, 171, 68, 88, 66, 67, 9, +253, 39, 252, 253, 184, 163, 130, 180, + 90, 250, 242, 115, 30, 39, 35, 1, + 0, 0, 0, 216, 9, 0, 0, 6, + 0, 0, 0, 56, 0, 0, 0, 168, + 2, 0, 0, 180, 6, 0, 0, 48, + 7, 0, 0, 236, 8, 0, 0, 80, + 9, 0, 0, 65, 111, 110, 57, 104, + 2, 0, 0, 104, 2, 0, 0, 0, + 2, 254, 255, 52, 2, 0, 0, 52, + 0, 0, 0, 1, 0, 36, 0, 0, + 0, 48, 0, 0, 0, 48, 0, 0, + 0, 36, 0, 1, 0, 48, 0, 0, + 0, 0, 0, 13, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 2, 254, 255, 81, 0, 0, 5, 0, + 0, 15, 160, 0, 0, 125, 67, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 81, 0, 0, 5, 14, + 0, 15, 160, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 128, 63, 0, + 0, 0, 63, 48, 0, 0, 5, 0, + 0, 15, 240, 253, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 31, 0, 0, 2, 5, + 0, 0, 128, 0, 0, 15, 144, 31, + 0, 0, 2, 5, 0, 1, 128, 1, + 0, 15, 144, 9, 0, 0, 3, 0, + 0, 1, 128, 1, 0, 228, 160, 1, + 0, 228, 144, 9, 0, 0, 3, 0, + 0, 2, 128, 2, 0, 228, 160, 1, + 0, 228, 144, 9, 0, 0, 3, 0, + 0, 4, 128, 3, 0, 228, 160, 1, + 0, 228, 144, 9, 0, 0, 3, 0, + 0, 8, 128, 4, 0, 228, 160, 1, + 0, 228, 144, 2, 0, 0, 3, 1, + 0, 7, 128, 0, 0, 228, 129, 12, + 0, 228, 160, 1, 0, 0, 2, 2, + 0, 7, 128, 14, 0, 85, 160, 1, + 0, 0, 2, 1, 0, 8, 128, 14, + 0, 85, 160, 38, 0, 0, 1, 0, + 0, 228, 240, 45, 0, 3, 2, 1, + 0, 255, 128, 14, 0, 170, 160, 2, + 0, 0, 3, 1, 0, 8, 128, 1, + 0, 255, 128, 14, 0, 170, 160, 1, + 0, 0, 2, 2, 0, 7, 128, 1, + 0, 228, 128, 39, 0, 0, 0, 1, + 0, 0, 2, 1, 0, 7, 224, 2, + 0, 228, 128, 2, 0, 0, 3, 1, + 0, 7, 128, 0, 0, 228, 129, 13, + 0, 228, 160, 1, 0, 0, 2, 2, + 0, 7, 128, 14, 0, 85, 160, 1, + 0, 0, 2, 1, 0, 8, 128, 14, + 0, 85, 160, 38, 0, 0, 1, 0, + 0, 228, 240, 45, 0, 3, 2, 1, + 0, 255, 128, 14, 0, 170, 160, 2, + 0, 0, 3, 1, 0, 8, 128, 1, + 0, 255, 128, 14, 0, 170, 160, 1, + 0, 0, 2, 2, 0, 7, 128, 1, + 0, 228, 128, 39, 0, 0, 0, 1, + 0, 0, 2, 2, 0, 7, 224, 2, + 0, 228, 128, 8, 0, 0, 3, 0, + 0, 1, 224, 5, 0, 228, 160, 0, + 0, 228, 144, 8, 0, 0, 3, 0, + 0, 2, 224, 6, 0, 228, 160, 0, + 0, 228, 144, 8, 0, 0, 3, 0, + 0, 4, 224, 7, 0, 228, 160, 0, + 0, 228, 144, 9, 0, 0, 3, 1, + 0, 1, 128, 8, 0, 228, 160, 0, + 0, 228, 128, 9, 0, 0, 3, 1, + 0, 4, 128, 9, 0, 228, 160, 0, + 0, 228, 128, 9, 0, 0, 3, 1, + 0, 8, 128, 10, 0, 228, 160, 0, + 0, 228, 128, 9, 0, 0, 3, 0, + 0, 1, 128, 11, 0, 228, 160, 0, + 0, 228, 128, 1, 0, 0, 2, 1, + 0, 2, 128, 1, 0, 170, 129, 2, + 0, 0, 3, 0, 0, 2, 128, 0, + 0, 0, 128, 1, 0, 255, 128, 5, + 0, 0, 3, 0, 0, 4, 192, 0, + 0, 85, 128, 14, 0, 255, 160, 4, + 0, 0, 4, 0, 0, 3, 192, 0, + 0, 0, 128, 0, 0, 228, 160, 1, + 0, 228, 128, 1, 0, 0, 2, 0, + 0, 8, 192, 0, 0, 0, 128, 255, +255, 0, 0, 83, 72, 68, 82, 4, + 4, 0, 0, 64, 0, 1, 0, 1, + 1, 0, 0, 89, 0, 0, 4, 70, +142, 32, 0, 0, 0, 0, 0, 13, + 0, 0, 0, 95, 0, 0, 3, 114, + 16, 16, 0, 0, 0, 0, 0, 95, + 0, 0, 3, 242, 16, 16, 0, 1, + 0, 0, 0, 101, 0, 0, 3, 114, + 32, 16, 0, 0, 0, 0, 0, 101, + 0, 0, 3, 114, 32, 16, 0, 1, + 0, 0, 0, 101, 0, 0, 3, 114, + 32, 16, 0, 2, 0, 0, 0, 103, + 0, 0, 4, 242, 32, 16, 0, 3, + 0, 0, 0, 1, 0, 0, 0, 104, + 0, 0, 2, 3, 0, 0, 0, 105, + 0, 0, 4, 0, 0, 0, 0, 1, + 0, 0, 0, 4, 0, 0, 0, 105, + 0, 0, 4, 1, 0, 0, 0, 1, + 0, 0, 0, 4, 0, 0, 0, 54, + 0, 0, 9, 114, 48, 32, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, + 64, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 54, 0, 0, 9, 114, + 48, 32, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 2, 64, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 17, + 0, 0, 8, 18, 0, 16, 0, 0, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 70, + 30, 16, 0, 1, 0, 0, 0, 17, + 0, 0, 8, 34, 0, 16, 0, 0, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 70, + 30, 16, 0, 1, 0, 0, 0, 17, + 0, 0, 8, 66, 0, 16, 0, 0, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 2, 0, 0, 0, 70, + 30, 16, 0, 1, 0, 0, 0, 17, + 0, 0, 8, 130, 0, 16, 0, 0, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 70, + 30, 16, 0, 1, 0, 0, 0, 0, + 0, 0, 9, 114, 0, 16, 0, 1, + 0, 0, 0, 70, 2, 16, 128, 65, + 0, 0, 0, 0, 0, 0, 0, 70, +130, 32, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 54, 0, 0, 5, 130, + 0, 16, 0, 1, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 0, 48, + 0, 0, 1, 33, 0, 0, 7, 18, + 0, 16, 0, 2, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 1, + 64, 0, 0, 1, 0, 0, 0, 3, + 0, 4, 3, 10, 0, 16, 0, 2, + 0, 0, 0, 54, 0, 0, 6, 114, + 48, 32, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 1, + 0, 0, 0, 30, 0, 0, 7, 130, + 0, 16, 0, 1, 0, 0, 0, 58, + 0, 16, 0, 1, 0, 0, 0, 1, + 64, 0, 0, 1, 0, 0, 0, 22, + 0, 0, 1, 0, 0, 0, 9, 114, + 0, 16, 0, 1, 0, 0, 0, 70, + 2, 16, 128, 65, 0, 0, 0, 0, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 12, 0, 0, 0, 54, + 0, 0, 5, 130, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 0, + 0, 0, 0, 48, 0, 0, 1, 33, + 0, 0, 7, 18, 0, 16, 0, 2, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 3, 0, 4, 3, 10, + 0, 16, 0, 2, 0, 0, 0, 54, + 0, 0, 6, 114, 48, 32, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 30, + 0, 0, 7, 130, 0, 16, 0, 1, + 0, 0, 0, 58, 0, 16, 0, 1, + 0, 0, 0, 1, 64, 0, 0, 1, + 0, 0, 0, 22, 0, 0, 1, 16, + 0, 0, 8, 18, 32, 16, 0, 0, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 4, 0, 0, 0, 70, + 18, 16, 0, 0, 0, 0, 0, 16, + 0, 0, 8, 34, 32, 16, 0, 0, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 5, 0, 0, 0, 70, + 18, 16, 0, 0, 0, 0, 0, 16, + 0, 0, 8, 66, 32, 16, 0, 0, + 0, 0, 0, 70, 130, 32, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 70, + 18, 16, 0, 0, 0, 0, 0, 17, + 0, 0, 8, 18, 32, 16, 0, 3, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 7, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 17, + 0, 0, 8, 18, 0, 16, 0, 1, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 8, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 17, + 0, 0, 8, 34, 0, 16, 0, 1, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 17, + 0, 0, 8, 18, 0, 16, 0, 0, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 10, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 6, 34, 32, 16, 0, 3, + 0, 0, 0, 10, 0, 16, 128, 65, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 7, 34, 0, 16, 0, 0, + 0, 0, 0, 10, 0, 16, 0, 0, + 0, 0, 0, 26, 0, 16, 0, 1, + 0, 0, 0, 56, 0, 0, 7, 66, + 32, 16, 0, 3, 0, 0, 0, 26, + 0, 16, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 63, 54, + 0, 0, 6, 114, 32, 16, 0, 1, + 0, 0, 0, 70, 50, 32, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 54, + 0, 0, 6, 114, 32, 16, 0, 2, + 0, 0, 0, 70, 50, 32, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 130, 32, 16, 0, 3, + 0, 0, 0, 10, 0, 16, 0, 0, + 0, 0, 0, 62, 0, 0, 1, 83, + 84, 65, 84, 116, 0, 0, 0, 36, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 16, + 0, 0, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 6, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 82, 68, 69, 70, 180, + 1, 0, 0, 1, 0, 0, 0, 72, + 0, 0, 0, 1, 0, 0, 0, 28, + 0, 0, 0, 0, 4, 254, 255, 0, + 65, 0, 0, 128, 1, 0, 0, 60, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 36, + 71, 108, 111, 98, 97, 108, 115, 0, +171, 171, 171, 60, 0, 0, 0, 5, + 0, 0, 0, 96, 0, 0, 0, 208, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 216, 0, 0, 0, 0, + 0, 0, 0, 64, 0, 0, 0, 2, + 0, 0, 0, 232, 0, 0, 0, 0, + 0, 0, 0, 248, 0, 0, 0, 64, + 0, 0, 0, 44, 0, 0, 0, 2, + 0, 0, 0, 12, 1, 0, 0, 0, + 0, 0, 0, 28, 1, 0, 0, 112, + 0, 0, 0, 64, 0, 0, 0, 2, + 0, 0, 0, 232, 0, 0, 0, 0, + 0, 0, 0, 40, 1, 0, 0, 176, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 68, 1, 0, 0, 0, + 0, 0, 0, 84, 1, 0, 0, 192, + 0, 0, 0, 12, 0, 0, 0, 2, + 0, 0, 0, 112, 1, 0, 0, 0, + 0, 0, 0, 95, 67, 67, 95, 77, + 86, 77, 97, 116, 114, 105, 120, 0, +171, 171, 171, 3, 0, 3, 0, 4, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 95, 67, 67, 95, 78, +111, 114, 109, 97, 108, 77, 97, 116, +114, 105, 120, 0, 171, 171, 171, 3, + 0, 3, 0, 3, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 95, + 67, 67, 95, 80, 77, 97, 116, 114, +105, 120, 0, 95, 117, 95, 80, 111, +105, 110, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 80, 111, +115, 105, 116, 105, 111, 110, 0, 1, + 0, 3, 0, 1, 0, 3, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 95, +117, 95, 83, 112, 111, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 80, 111, 115, 105, 116, 105, 111, +110, 0, 171, 1, 0, 3, 0, 1, + 0, 3, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 77, 105, 99, 114, 111, +115, 111, 102, 116, 32, 40, 82, 41, + 32, 72, 76, 83, 76, 32, 83, 104, + 97, 100, 101, 114, 32, 67, 111, 109, +112, 105, 108, 101, 114, 32, 54, 46, + 51, 46, 57, 54, 48, 48, 46, 49, + 54, 51, 56, 52, 0, 171, 171, 73, + 83, 71, 78, 92, 0, 0, 0, 3, + 0, 0, 0, 8, 0, 0, 0, 80, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 7, 7, 0, 0, 80, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 1, + 0, 0, 0, 15, 15, 0, 0, 80, + 0, 0, 0, 2, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 2, + 0, 0, 0, 3, 0, 0, 0, 84, + 69, 88, 67, 79, 79, 82, 68, 0, +171, 171, 171, 79, 83, 71, 78, 128, + 0, 0, 0, 4, 0, 0, 0, 8, + 0, 0, 0, 104, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 7, + 8, 0, 0, 104, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 1, 0, 0, 0, 7, + 8, 0, 0, 104, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 2, 0, 0, 0, 7, + 8, 0, 0, 113, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 3, + 0, 0, 0, 3, 0, 0, 0, 15, + 0, 0, 0, 84, 69, 88, 67, 79, + 79, 82, 68, 0, 83, 86, 95, 80, +111, 115, 105, 116, 105, 111, 110, 0, +171, 171, 171, +}; + const unsigned char s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE[] = { 166, 147, 0, 0, 142, 9, 2, 1, @@ -5038,7 +7231,7 @@ const unsigned char s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 96, 4, 0, 0, 148, 13, 0, 0, 0, 0, 0, - 0, 194, 137, 0, 0, 0, 0, 0, + 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -5709,7 +7902,7 @@ const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 144, 4, 0, 0, 0, 0, 0, - 0, 194, 137, 0, 0, 0, 0, 0, + 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -6000,6 +8193,2047 @@ const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { 171, }; +const unsigned char s_A883DF8204EA77D28BC638CEAAB512DEE74FBB65[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 81, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 3, 0, + 0, 0, 82, 139, 0, 0, 12, 0, + 0, 0, 97, 95, 98, 108, 101, 110, +100, 73, 110, 100, 101, 120, 0, 0, + 0, 0, 80, 139, 0, 0, 10, 0, + 0, 0, 97, 95, 116, 101, 120, 67, +111, 111, 114, 100, 4, 0, 0, 0, + 82, 139, 0, 0, 13, 0, 0, 0, + 97, 95, 98, 108, 101, 110, 100, 87, +101, 105, 103, 104, 116, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 81, 139, 0, 0, 8, 0, 0, + 0, 97, 95, 110, 111, 114, 109, 97, +108, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 0, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 18, 0, 0, 0, 92, 139, + 0, 0, 242, 141, 0, 0, 11, 0, + 0, 0, 67, 67, 95, 77, 86, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 4, 0, 0, 0, 91, 139, 0, + 0, 242, 141, 0, 0, 15, 0, 0, + 0, 67, 67, 95, 78, 111, 114, 109, + 97, 108, 77, 97, 116, 114, 105, 120, + 0, 0, 0, 0, 255, 255, 255, 255, + 4, 0, 0, 0, 3, 0, 0, 0, + 92, 139, 0, 0, 242, 141, 0, 0, + 10, 0, 0, 0, 67, 67, 95, 80, + 77, 97, 116, 114, 105, 120, 0, 0, + 0, 0, 255, 255, 255, 255, 7, 0, + 0, 0, 4, 0, 0, 0, 81, 139, + 0, 0, 242, 141, 0, 0, 26, 0, + 0, 0, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 80, 111, 115, 105, +116, 105, 111, 110, 1, 0, 0, 0, +255, 255, 255, 255, 11, 0, 0, 0, + 1, 0, 0, 0, 81, 139, 0, 0, +242, 141, 0, 0, 25, 0, 0, 0, +117, 95, 83, 112, 111, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 80, 111, 115, 105, 116, 105, 111, +110, 1, 0, 0, 0, 255, 255, 255, +255, 12, 0, 0, 0, 1, 0, 0, + 0, 82, 139, 0, 0, 242, 141, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 180, 0, 0, 0, +255, 255, 255, 255, 13, 0, 0, 0, +180, 0, 0, 0, 94, 139, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 81, 139, 0, 0, 241, +141, 0, 0, 25, 0, 0, 0, 117, + 95, 65, 109, 98, 105, 101, 110, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 67, 111, 108, 111, 114, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 1, 0, 0, 0, + 81, 139, 0, 0, 241, 141, 0, 0, + 21, 0, 0, 0, 117, 95, 68, 105, +114, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 67, 111, 108, 111, +114, 1, 0, 0, 0, 1, 0, 0, + 0, 255, 255, 255, 255, 1, 0, 0, + 0, 81, 139, 0, 0, 241, 141, 0, + 0, 25, 0, 0, 0, 117, 95, 68, +105, 114, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 68, 105, 114, +101, 99, 116, 105, 111, 110, 1, 0, + 0, 0, 2, 0, 0, 0, 255, 255, +255, 255, 1, 0, 0, 0, 81, 139, + 0, 0, 241, 141, 0, 0, 23, 0, + 0, 0, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 67, 111, 108, 111, +114, 1, 0, 0, 0, 3, 0, 0, + 0, 255, 255, 255, 255, 1, 0, 0, + 0, 6, 20, 0, 0, 241, 141, 0, + 0, 30, 0, 0, 0, 117, 95, 80, +111, 105, 110, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 82, + 97, 110, 103, 101, 73, 110, 118, 101, +114, 115, 101, 1, 0, 0, 0, 4, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 81, 139, 0, 0, 241, +141, 0, 0, 22, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 1, 0, 0, + 0, 5, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 81, 139, 0, + 0, 241, 141, 0, 0, 26, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 68, 105, 114, 101, 99, 116, +105, 111, 110, 1, 0, 0, 0, 6, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 6, 20, 0, 0, 241, +141, 0, 0, 30, 0, 0, 0, 117, + 95, 83, 112, 111, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 73, 110, 110, 101, 114, 65, 110, 103, +108, 101, 67, 111, 115, 1, 0, 0, + 0, 7, 0, 0, 0, 255, 255, 255, +255, 1, 0, 0, 0, 6, 20, 0, + 0, 241, 141, 0, 0, 30, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 79, 117, 116, 101, 114, 65, +110, 103, 108, 101, 67, 111, 115, 1, + 0, 0, 0, 8, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 6, + 20, 0, 0, 241, 141, 0, 0, 29, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 82, 97, 110, 103, +101, 73, 110, 118, 101, 114, 115, 101, + 1, 0, 0, 0, 9, 0, 0, 0, +255, 255, 255, 255, 1, 0, 0, 0, + 82, 139, 0, 0, 241, 141, 0, 0, + 7, 0, 0, 0, 117, 95, 99, 111, +108, 111, 114, 0, 0, 0, 0, 10, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 197, 0, 0, 0, 11, + 0, 0, 0, 67, 67, 95, 77, 86, + 77, 97, 116, 114, 105, 120, 0, 0, + 0, 0, 0, 0, 0, 0, 15, 0, + 0, 0, 67, 67, 95, 78, 111, 114, +109, 97, 108, 77, 97, 116, 114, 105, +120, 0, 0, 0, 0, 1, 0, 0, + 0, 10, 0, 0, 0, 67, 67, 95, + 80, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 2, 0, 0, 0, 26, + 0, 0, 0, 117, 95, 80, 111, 105, +110, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 80, 111, 115, +105, 116, 105, 111, 110, 0, 0, 0, + 0, 3, 0, 0, 0, 25, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 80, 111, 115, 105, 116, 105, +111, 110, 0, 0, 0, 0, 4, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 0, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 1, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 2, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 3, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 4, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 5, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 6, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 7, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 8, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 9, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 10, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 11, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 12, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 13, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 14, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 15, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 16, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 17, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 18, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 19, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 20, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 21, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 22, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 23, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 24, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 25, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 26, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 27, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 28, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 29, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 30, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 31, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 32, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 33, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 34, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 35, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 36, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 37, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 38, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 39, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 40, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 41, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 42, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 43, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 44, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 45, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 46, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 47, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 48, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 49, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 50, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 51, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 52, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 53, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 54, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 55, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 56, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 57, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 58, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 59, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 60, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 61, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 62, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 63, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 64, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 65, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 66, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 67, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 68, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 69, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 70, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 71, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 72, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 73, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 74, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 75, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 76, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 77, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 78, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 79, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 80, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 81, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 82, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 83, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 84, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 85, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 86, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 87, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 88, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 89, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 90, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 91, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 92, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 93, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 94, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 95, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 96, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, + 97, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 98, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 99, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 100, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 101, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 102, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 103, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 104, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +105, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 106, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 107, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 108, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 109, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 110, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 111, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 112, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +113, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 114, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 115, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 116, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 117, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 118, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 119, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 120, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +121, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 122, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 123, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 124, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 125, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 126, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 127, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 128, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +129, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 130, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 131, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 132, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 133, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 134, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 135, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 136, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +137, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 138, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 139, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 140, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 141, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 142, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 143, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 144, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +145, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 146, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 147, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 148, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 149, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 150, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 151, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 152, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +153, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 154, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 155, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 156, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 157, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 158, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 159, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 160, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +161, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 162, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 163, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 164, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 165, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 166, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 167, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 168, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +169, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 170, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 171, 0, + 0, 0, 5, 0, 0, 0, 15, 0, + 0, 0, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 172, 0, 0, 0, 5, 0, 0, + 0, 15, 0, 0, 0, 117, 95, 109, + 97, 116, 114, 105, 120, 80, 97, 108, +101, 116, 116, 101, 173, 0, 0, 0, + 5, 0, 0, 0, 15, 0, 0, 0, +117, 95, 109, 97, 116, 114, 105, 120, + 80, 97, 108, 101, 116, 116, 101, 174, + 0, 0, 0, 5, 0, 0, 0, 15, + 0, 0, 0, 117, 95, 109, 97, 116, +114, 105, 120, 80, 97, 108, 101, 116, +116, 101, 175, 0, 0, 0, 5, 0, + 0, 0, 15, 0, 0, 0, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 176, 0, 0, + 0, 5, 0, 0, 0, 15, 0, 0, + 0, 117, 95, 109, 97, 116, 114, 105, +120, 80, 97, 108, 101, 116, 116, 101, +177, 0, 0, 0, 5, 0, 0, 0, + 15, 0, 0, 0, 117, 95, 109, 97, +116, 114, 105, 120, 80, 97, 108, 101, +116, 116, 101, 178, 0, 0, 0, 5, + 0, 0, 0, 15, 0, 0, 0, 117, + 95, 109, 97, 116, 114, 105, 120, 80, + 97, 108, 101, 116, 116, 101, 179, 0, + 0, 0, 5, 0, 0, 0, 11, 0, + 0, 0, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 0, 0, + 0, 6, 0, 0, 0, 25, 0, 0, + 0, 117, 95, 65, 109, 98, 105, 101, +110, 116, 76, 105, 103, 104, 116, 83, +111, 117, 114, 99, 101, 67, 111, 108, +111, 114, 0, 0, 0, 0, 7, 0, + 0, 0, 21, 0, 0, 0, 117, 95, + 68, 105, 114, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 67, 111, +108, 111, 114, 0, 0, 0, 0, 8, + 0, 0, 0, 25, 0, 0, 0, 117, + 95, 68, 105, 114, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 68, +105, 114, 101, 99, 116, 105, 111, 110, + 0, 0, 0, 0, 9, 0, 0, 0, + 23, 0, 0, 0, 117, 95, 80, 111, +105, 110, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 67, 111, +108, 111, 114, 0, 0, 0, 0, 10, + 0, 0, 0, 30, 0, 0, 0, 117, + 95, 80, 111, 105, 110, 116, 76, 105, +103, 104, 116, 83, 111, 117, 114, 99, +101, 82, 97, 110, 103, 101, 73, 110, +118, 101, 114, 115, 101, 0, 0, 0, + 0, 11, 0, 0, 0, 22, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, + 0, 0, 0, 12, 0, 0, 0, 26, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 68, 105, 114, 101, + 99, 116, 105, 111, 110, 0, 0, 0, + 0, 13, 0, 0, 0, 30, 0, 0, + 0, 117, 95, 83, 112, 111, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 73, 110, 110, 101, 114, 65, +110, 103, 108, 101, 67, 111, 115, 0, + 0, 0, 0, 14, 0, 0, 0, 30, + 0, 0, 0, 117, 95, 83, 112, 111, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 79, 117, 116, 101, +114, 65, 110, 103, 108, 101, 67, 111, +115, 0, 0, 0, 0, 15, 0, 0, + 0, 29, 0, 0, 0, 117, 95, 83, +112, 111, 116, 76, 105, 103, 104, 116, + 83, 111, 117, 114, 99, 101, 82, 97, +110, 103, 101, 73, 110, 118, 101, 114, +115, 101, 0, 0, 0, 0, 16, 0, + 0, 0, 7, 0, 0, 0, 117, 95, + 99, 111, 108, 111, 114, 0, 0, 0, + 0, 17, 0, 0, 0, 236, 16, 0, + 0, 188, 19, 0, 0, 0, 0, 0, + 0, 107, 155, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 88, 66, 67, 39, 224, 169, +185, 116, 156, 41, 157, 187, 9, 222, +142, 94, 217, 160, 100, 1, 0, 0, + 0, 236, 16, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 140, 3, 0, + 0, 144, 11, 0, 0, 12, 12, 0, + 0, 244, 15, 0, 0, 112, 16, 0, + 0, 65, 111, 110, 57, 76, 3, 0, + 0, 76, 3, 0, 0, 0, 2, 255, +255, 24, 3, 0, 0, 52, 0, 0, + 0, 1, 0, 40, 0, 0, 0, 52, + 0, 0, 0, 52, 0, 1, 0, 36, + 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 255, +255, 81, 0, 0, 5, 11, 0, 15, +160, 0, 0, 0, 0, 0, 0, 128, + 63, 0, 0, 0, 192, 0, 0, 64, + 64, 31, 0, 0, 2, 0, 0, 0, +128, 0, 0, 7, 176, 31, 0, 0, + 2, 0, 0, 0, 128, 1, 0, 7, +176, 31, 0, 0, 2, 0, 0, 0, +128, 2, 0, 7, 176, 31, 0, 0, + 2, 0, 0, 0, 128, 3, 0, 3, +176, 31, 0, 0, 2, 0, 0, 0, +144, 0, 8, 15, 160, 5, 0, 0, + 3, 0, 0, 7, 128, 1, 0, 228, +176, 4, 0, 0, 160, 8, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 228, +128, 0, 0, 228, 128, 2, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 0, +129, 11, 0, 85, 160, 11, 0, 0, + 3, 1, 0, 8, 128, 0, 0, 0, +128, 11, 0, 0, 160, 2, 0, 0, + 3, 0, 0, 7, 128, 2, 0, 228, +160, 2, 0, 228, 160, 36, 0, 0, + 2, 1, 0, 7, 128, 0, 0, 228, +128, 36, 0, 0, 2, 0, 0, 7, +128, 0, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 228, +128, 1, 0, 228, 129, 5, 0, 0, + 3, 1, 0, 7, 128, 0, 0, 255, +128, 1, 0, 228, 160, 88, 0, 0, + 4, 1, 0, 7, 128, 0, 0, 255, +128, 1, 0, 228, 128, 11, 0, 0, +160, 2, 0, 0, 3, 1, 0, 7, +128, 1, 0, 228, 128, 0, 0, 228, +160, 36, 0, 0, 2, 2, 0, 7, +128, 1, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 228, +128, 2, 0, 228, 128, 5, 0, 0, + 3, 2, 0, 7, 128, 0, 0, 255, +128, 3, 0, 228, 160, 88, 0, 0, + 4, 2, 0, 7, 128, 0, 0, 255, +128, 2, 0, 228, 128, 11, 0, 0, +160, 4, 0, 0, 4, 1, 0, 7, +128, 2, 0, 228, 128, 1, 0, 255, +128, 1, 0, 228, 128, 2, 0, 0, + 3, 2, 0, 7, 128, 6, 0, 228, +160, 6, 0, 228, 160, 36, 0, 0, + 2, 3, 0, 7, 128, 2, 0, 228, +128, 36, 0, 0, 2, 2, 0, 7, +128, 2, 0, 228, 176, 8, 0, 0, + 3, 0, 0, 8, 128, 3, 0, 228, +128, 2, 0, 228, 129, 8, 0, 0, + 3, 1, 0, 8, 128, 0, 0, 228, +128, 2, 0, 228, 128, 2, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 255, +128, 8, 0, 0, 161, 1, 0, 0, + 2, 2, 0, 1, 128, 8, 0, 0, +160, 2, 0, 0, 3, 0, 0, 2, +128, 2, 0, 0, 129, 7, 0, 0, +160, 6, 0, 0, 2, 0, 0, 2, +128, 0, 0, 85, 128, 5, 0, 0, + 3, 0, 0, 17, 128, 0, 0, 85, +128, 0, 0, 0, 128, 4, 0, 0, + 4, 0, 0, 2, 128, 0, 0, 0, +128, 11, 0, 170, 160, 11, 0, 255, +160, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 0, +128, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 85, +128, 5, 0, 0, 3, 0, 0, 14, +128, 2, 0, 144, 176, 9, 0, 0, +160, 8, 0, 0, 3, 0, 0, 2, +128, 0, 0, 249, 128, 0, 0, 249, +128, 2, 0, 0, 3, 0, 0, 2, +128, 0, 0, 85, 129, 11, 0, 85, +160, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 0, 0, 85, +128, 88, 0, 0, 4, 0, 0, 1, +128, 0, 0, 85, 128, 0, 0, 0, +128, 11, 0, 0, 160, 5, 0, 0, + 3, 0, 0, 14, 128, 1, 0, 255, +128, 5, 0, 144, 160, 88, 0, 0, + 4, 0, 0, 14, 128, 1, 0, 255, +128, 0, 0, 228, 128, 11, 0, 0, +160, 4, 0, 0, 4, 0, 0, 7, +128, 0, 0, 249, 128, 0, 0, 0, +128, 1, 0, 228, 128, 66, 0, 0, + 3, 1, 0, 15, 128, 3, 0, 228, +176, 0, 8, 228, 160, 5, 0, 0, + 3, 1, 0, 15, 128, 1, 0, 228, +128, 10, 0, 228, 160, 1, 0, 0, + 2, 0, 0, 8, 128, 11, 0, 85, +160, 5, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 128, 1, 0, 228, +128, 1, 0, 0, 2, 0, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 1, 8, 15, 128, 0, 0, 228, +128, 1, 0, 0, 2, 2, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 3, 8, 15, 128, 0, 0, 228, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 252, 7, 0, 0, 64, 0, 0, + 0, 255, 1, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 11, 0, 0, 0, 90, 0, 0, + 3, 0, 96, 16, 0, 0, 0, 0, + 0, 88, 24, 0, 4, 0, 112, 16, + 0, 0, 0, 0, 0, 85, 85, 0, + 0, 98, 16, 0, 3, 114, 16, 16, + 0, 0, 0, 0, 0, 98, 16, 0, + 3, 114, 16, 16, 0, 1, 0, 0, + 0, 98, 16, 0, 3, 114, 16, 16, + 0, 2, 0, 0, 0, 98, 16, 0, + 3, 50, 16, 16, 0, 3, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 1, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 2, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 3, 0, 0, + 0, 104, 0, 0, 2, 4, 0, 0, + 0, 16, 0, 0, 7, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 68, 0, 0, + 5, 18, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 0, 0, 0, 0, 6, 0, 16, + 0, 0, 0, 0, 0, 70, 18, 16, + 0, 0, 0, 0, 0, 0, 0, 0, + 9, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 2, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 68, 0, 0, + 5, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 1, 0, 0, 0, 246, 15, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 8, 130, 0, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 128, 65, 0, 0, + 0, 1, 0, 0, 0, 52, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 6, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 18, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 10, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 10, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 246, 15, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 30, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 56, 0, 0, 8, 114, 0, 16, + 0, 2, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 6, 128, 32, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 0, 0, 0, + 8, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 128, 63, 52, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 68, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 56, 0, 0, 7, 114, 0, 16, + 0, 2, 0, 0, 0, 246, 15, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 52, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 56, 0, 0, + 8, 114, 0, 16, 0, 2, 0, 0, + 0, 246, 15, 16, 0, 1, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 54, 0, 0, + 5, 114, 0, 16, 0, 3, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 130, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 58, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 9, 114, 0, 16, + 0, 3, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 246, 15, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 3, 0, 0, 0, 30, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 22, 0, 0, 1, 56, 0, 0, + 8, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 6, 128, 32, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 0, 0, 0, 8, 130, 0, 16, + 0, 0, 0, 0, 0, 58, 0, 16, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 52, 0, 0, 7, 130, 0, 16, + 0, 0, 0, 0, 0, 58, 0, 16, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 16, 0, 0, + 7, 18, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 68, 0, 0, 5, 18, 0, 16, + 0, 1, 0, 0, 0, 10, 0, 16, + 0, 1, 0, 0, 0, 56, 0, 0, + 7, 114, 0, 16, 0, 1, 0, 0, + 0, 6, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 0, 0, 0, 9, 114, 0, 16, + 0, 2, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 6, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 6, 0, 0, 0, 16, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 68, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 56, 0, 0, + 7, 114, 0, 16, 0, 2, 0, 0, + 0, 246, 15, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 16, 0, 0, 8, 130, 0, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 70, 2, 16, +128, 65, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 10, 18, 0, 16, + 0, 2, 0, 0, 0, 10, 128, 32, + 0, 0, 0, 0, 0, 7, 0, 0, + 0, 10, 128, 32, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, + 0, 0, 0, 0, 9, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 10, 128, 32, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 14, 0, 0, + 10, 18, 0, 16, 0, 2, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 128, + 63, 0, 0, 128, 63, 0, 0, 128, + 63, 0, 0, 128, 63, 10, 0, 16, + 0, 2, 0, 0, 0, 56, 32, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 0, 2, 0, 0, + 0, 50, 0, 0, 9, 18, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 192, 1, 64, 0, + 0, 0, 0, 64, 64, 56, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 56, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 10, 0, 16, + 0, 2, 0, 0, 0, 56, 0, 0, + 7, 130, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 0, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 16, 0, 0, 7, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 52, 0, 0, + 7, 18, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 56, 0, 0, 8, 114, 0, 16, + 0, 0, 0, 0, 0, 6, 0, 16, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 5, 0, 0, + 0, 54, 0, 0, 5, 114, 0, 16, + 0, 1, 0, 0, 0, 70, 2, 16, + 0, 3, 0, 0, 0, 54, 0, 0, + 5, 18, 0, 16, 0, 2, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 1, 33, 0, 0, + 7, 34, 0, 16, 0, 2, 0, 0, + 0, 10, 0, 16, 0, 2, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 3, 0, 4, 3, 26, 0, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 9, 114, 0, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 246, 15, 16, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 30, 0, 0, 7, 18, 0, 16, + 0, 2, 0, 0, 0, 10, 0, 16, + 0, 2, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 69, 0, 0, 9, 242, 0, 16, + 0, 0, 0, 0, 0, 70, 16, 16, + 0, 3, 0, 0, 0, 70, 126, 16, + 0, 0, 0, 0, 0, 0, 96, 16, + 0, 0, 0, 0, 0, 56, 0, 0, + 8, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 10, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 56, 0, 0, 7, 242, 0, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 1, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 0, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 2, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 62, 0, 0, + 1, 83, 84, 65, 84, 116, 0, 0, + 0, 75, 0, 0, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, + 0, 47, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 82, 68, 69, + 70, 224, 3, 0, 0, 1, 0, 0, + 0, 176, 0, 0, 0, 3, 0, 0, + 0, 28, 0, 0, 0, 0, 4, 255, +255, 0, 65, 0, 0, 172, 3, 0, + 0, 124, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 145, 0, 0, 0, 2, 0, 0, + 0, 5, 0, 0, 0, 4, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 1, 0, 0, 0, 13, 0, 0, + 0, 166, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 115, 97, 109, 112, 108, 101, 114, + 95, 95, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 116, 101, +120, 116, 117, 114, 101, 95, 95, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 36, 71, 108, 111, 98, + 97, 108, 115, 0, 171, 166, 0, 0, + 0, 11, 0, 0, 0, 200, 0, 0, + 0, 176, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 208, 1, 0, + 0, 0, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 236, 1, 0, + 0, 0, 0, 0, 0, 252, 1, 0, + 0, 16, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 20, 2, 0, + 0, 0, 0, 0, 0, 36, 2, 0, + 0, 32, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 64, 2, 0, + 0, 0, 0, 0, 0, 80, 2, 0, + 0, 48, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 108, 2, 0, + 0, 0, 0, 0, 0, 124, 2, 0, + 0, 64, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 156, 2, 0, + 0, 0, 0, 0, 0, 172, 2, 0, + 0, 80, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 196, 2, 0, + 0, 0, 0, 0, 0, 212, 2, 0, + 0, 96, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 240, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 112, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 32, 3, 0, + 0, 0, 0, 0, 0, 48, 3, 0, + 0, 128, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 80, 3, 0, + 0, 0, 0, 0, 0, 96, 3, 0, + 0, 144, 0, 0, 0, 4, 0, 0, + 0, 2, 0, 0, 0, 128, 3, 0, + 0, 0, 0, 0, 0, 144, 3, 0, + 0, 160, 0, 0, 0, 16, 0, 0, + 0, 2, 0, 0, 0, 156, 3, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 65, 109, 98, 105, 101, 110, 116, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 68, 105, 114, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 67, 111, 108, 111, 114, 0, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 68, 105, 114, 76, +105, 103, 104, 116, 83, 111, 117, 114, + 99, 101, 68, 105, 114, 101, 99, 116, +105, 111, 110, 0, 171, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 80, 111, 105, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 67, 111, 108, 111, 114, 0, 171, 171, +171, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 80, 111, 105, 110, +116, 76, 105, 103, 104, 116, 83, 111, +117, 114, 99, 101, 82, 97, 110, 103, +101, 73, 110, 118, 101, 114, 115, 101, + 0, 0, 0, 3, 0, 1, 0, 1, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 83, 112, 111, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 67, 111, 108, 111, 114, + 0, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 83, 112, 111, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 68, 105, 114, 101, 99, +116, 105, 111, 110, 0, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 73, +110, 110, 101, 114, 65, 110, 103, 108, +101, 67, 111, 115, 0, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 79, +117, 116, 101, 114, 65, 110, 103, 108, +101, 67, 111, 115, 0, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 83, 112, 111, 116, 76, 105, 103, 104, +116, 83, 111, 117, 114, 99, 101, 82, + 97, 110, 103, 101, 73, 110, 118, 101, +114, 115, 101, 0, 171, 0, 0, 3, + 0, 1, 0, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, + 99, 111, 108, 111, 114, 0, 171, 171, +171, 1, 0, 3, 0, 1, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 77, 105, 99, 114, 111, 115, 111, +102, 116, 32, 40, 82, 41, 32, 72, + 76, 83, 76, 32, 83, 104, 97, 100, +101, 114, 32, 67, 111, 109, 112, 105, +108, 101, 114, 32, 54, 46, 51, 46, + 57, 54, 48, 48, 46, 49, 54, 51, + 56, 52, 0, 171, 171, 73, 83, 71, + 78, 116, 0, 0, 0, 4, 0, 0, + 0, 8, 0, 0, 0, 104, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 7, 7, 0, 0, 104, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 3, 3, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 171, 171, +171, 79, 83, 71, 78, 116, 0, 0, + 0, 4, 0, 0, 0, 8, 0, 0, + 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 0, 0, 0, 15, 0, 0, + 0, 104, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 15, 0, 0, + 0, 83, 86, 95, 84, 97, 114, 103, +101, 116, 0, 171, 171, 68, 88, 66, + 67, 81, 182, 195, 84, 24, 43, 87, +158, 66, 2, 136, 175, 232, 16, 88, +248, 1, 0, 0, 0, 188, 19, 0, + 0, 6, 0, 0, 0, 56, 0, 0, + 0, 120, 6, 0, 0, 20, 16, 0, + 0, 144, 16, 0, 0, 136, 18, 0, + 0, 28, 19, 0, 0, 65, 111, 110, + 57, 56, 6, 0, 0, 56, 6, 0, + 0, 0, 2, 254, 255, 4, 6, 0, + 0, 52, 0, 0, 0, 1, 0, 36, + 0, 0, 0, 48, 0, 0, 0, 48, + 0, 0, 0, 36, 0, 1, 0, 48, + 0, 0, 0, 0, 0, 193, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, + 0, 1, 2, 254, 255, 81, 0, 0, + 5, 194, 0, 15, 160, 0, 0, 64, + 64, 0, 0, 0, 0, 0, 0, 128, + 63, 0, 0, 0, 0, 81, 0, 0, + 5, 0, 0, 15, 160, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 125, 67, 81, 0, 0, + 5, 195, 0, 15, 160, 0, 0, 0, + 63, 0, 0, 128, 63, 0, 0, 128, +191, 0, 0, 0, 0, 48, 0, 0, + 5, 0, 0, 15, 240, 253, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 31, 0, 0, + 2, 5, 0, 0, 128, 0, 0, 15, +144, 31, 0, 0, 2, 5, 0, 1, +128, 1, 0, 15, 144, 31, 0, 0, + 2, 5, 0, 2, 128, 2, 0, 15, +144, 31, 0, 0, 2, 5, 0, 3, +128, 3, 0, 15, 144, 31, 0, 0, + 2, 5, 0, 4, 128, 4, 0, 15, +144, 19, 0, 0, 2, 0, 0, 1, +128, 0, 0, 0, 144, 2, 0, 0, + 3, 0, 0, 2, 128, 0, 0, 0, +129, 0, 0, 0, 144, 12, 0, 0, + 3, 0, 0, 4, 128, 0, 0, 0, +144, 0, 0, 0, 145, 12, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 0, +129, 0, 0, 0, 128, 4, 0, 0, + 4, 0, 0, 1, 128, 0, 0, 170, +128, 0, 0, 0, 128, 0, 0, 85, +128, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 194, 0, 0, +160, 46, 0, 0, 2, 0, 0, 1, +176, 0, 0, 0, 128, 5, 0, 0, + 4, 0, 0, 15, 128, 1, 0, 0, +144, 13, 32, 228, 160, 0, 0, 0, +176, 5, 0, 0, 4, 1, 0, 15, +128, 1, 0, 0, 144, 14, 32, 228, +160, 0, 0, 0, 176, 5, 0, 0, + 4, 2, 0, 15, 128, 1, 0, 0, +144, 15, 32, 228, 160, 0, 0, 0, +176, 41, 0, 4, 2, 194, 0, 85, +160, 1, 0, 85, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 85, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 85, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 85, 144, 0, 0, 85, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 194, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 13, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 0, 0, 228, +128, 4, 0, 0, 5, 1, 0, 15, +128, 14, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 1, 0, 228, +128, 4, 0, 0, 5, 2, 0, 15, +128, 15, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 41, 0, 4, 2, 194, 0, 85, +160, 1, 0, 170, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 170, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 170, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 170, 144, 0, 0, 170, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 194, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 13, 32, 228, 160, 0, 0, 0, +176, 1, 0, 170, 144, 0, 0, 228, +128, 4, 0, 0, 5, 1, 0, 15, +128, 14, 32, 228, 160, 0, 0, 0, +176, 1, 0, 170, 144, 1, 0, 228, +128, 4, 0, 0, 5, 2, 0, 15, +128, 15, 32, 228, 160, 0, 0, 0, +176, 1, 0, 170, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 41, 0, 4, 2, 194, 0, 85, +160, 1, 0, 255, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 255, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 255, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 255, 144, 0, 0, 255, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 194, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 13, 32, 228, 160, 0, 0, 0, +176, 1, 0, 255, 144, 0, 0, 228, +128, 4, 0, 0, 5, 1, 0, 15, +128, 14, 32, 228, 160, 0, 0, 0, +176, 1, 0, 255, 144, 1, 0, 228, +128, 4, 0, 0, 5, 2, 0, 15, +128, 15, 32, 228, 160, 0, 0, 0, +176, 1, 0, 255, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 4, 0, 0, 4, 3, 0, 15, +128, 3, 0, 36, 144, 194, 0, 106, +160, 194, 0, 149, 160, 9, 0, 0, + 3, 4, 0, 1, 128, 3, 0, 228, +128, 0, 0, 228, 128, 9, 0, 0, + 3, 4, 0, 2, 128, 3, 0, 228, +128, 1, 0, 228, 128, 9, 0, 0, + 3, 4, 0, 4, 128, 3, 0, 228, +128, 2, 0, 228, 128, 8, 0, 0, + 3, 0, 0, 1, 128, 2, 0, 228, +144, 0, 0, 228, 128, 8, 0, 0, + 3, 0, 0, 2, 128, 2, 0, 228, +144, 1, 0, 228, 128, 8, 0, 0, + 3, 0, 0, 4, 128, 2, 0, 228, +144, 2, 0, 228, 128, 1, 0, 0, + 2, 4, 0, 8, 128, 194, 0, 170, +160, 9, 0, 0, 3, 1, 0, 1, +128, 0, 0, 228, 160, 4, 0, 228, +128, 9, 0, 0, 3, 1, 0, 2, +128, 1, 0, 228, 160, 4, 0, 228, +128, 9, 0, 0, 3, 1, 0, 4, +128, 2, 0, 228, 160, 4, 0, 228, +128, 9, 0, 0, 3, 1, 0, 8, +128, 3, 0, 228, 160, 4, 0, 228, +128, 2, 0, 0, 3, 2, 0, 7, +128, 1, 0, 228, 129, 11, 0, 228, +160, 1, 0, 0, 2, 3, 0, 7, +128, 194, 0, 85, 160, 1, 0, 0, + 2, 0, 0, 8, 128, 194, 0, 85, +160, 38, 0, 0, 1, 0, 0, 228, +240, 45, 0, 3, 2, 0, 0, 255, +128, 194, 0, 170, 160, 2, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 255, +128, 194, 0, 170, 160, 1, 0, 0, + 2, 3, 0, 7, 128, 2, 0, 228, +128, 39, 0, 0, 0, 1, 0, 0, + 2, 1, 0, 7, 224, 3, 0, 228, +128, 2, 0, 0, 3, 2, 0, 7, +128, 1, 0, 228, 129, 12, 0, 228, +160, 1, 0, 0, 2, 3, 0, 7, +128, 194, 0, 85, 160, 1, 0, 0, + 2, 0, 0, 8, 128, 194, 0, 85, +160, 38, 0, 0, 1, 0, 0, 228, +240, 45, 0, 3, 2, 0, 0, 255, +128, 194, 0, 170, 160, 2, 0, 0, + 3, 0, 0, 8, 128, 0, 0, 255, +128, 194, 0, 170, 160, 1, 0, 0, + 2, 3, 0, 7, 128, 2, 0, 228, +128, 39, 0, 0, 0, 1, 0, 0, + 2, 2, 0, 7, 224, 3, 0, 228, +128, 8, 0, 0, 3, 0, 0, 1, +224, 4, 0, 228, 160, 0, 0, 228, +128, 8, 0, 0, 3, 0, 0, 2, +224, 5, 0, 228, 160, 0, 0, 228, +128, 8, 0, 0, 3, 0, 0, 4, +224, 6, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 0, 0, 1, +128, 7, 0, 228, 160, 1, 0, 228, +128, 9, 0, 0, 3, 0, 0, 4, +128, 8, 0, 228, 160, 1, 0, 228, +128, 9, 0, 0, 3, 0, 0, 8, +128, 9, 0, 228, 160, 1, 0, 228, +128, 9, 0, 0, 3, 1, 0, 1, +128, 10, 0, 228, 160, 1, 0, 228, +128, 1, 0, 0, 2, 0, 0, 2, +128, 0, 0, 170, 129, 2, 0, 0, + 3, 0, 0, 4, 128, 0, 0, 255, +128, 1, 0, 0, 128, 5, 0, 0, + 3, 0, 0, 4, 192, 0, 0, 170, +128, 195, 0, 0, 160, 4, 0, 0, + 4, 0, 0, 3, 192, 1, 0, 0, +128, 193, 0, 228, 160, 0, 0, 228, +128, 4, 0, 0, 4, 3, 0, 3, +224, 4, 0, 228, 144, 195, 0, 233, +160, 195, 0, 231, 160, 1, 0, 0, + 2, 0, 0, 8, 192, 1, 0, 0, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 148, 9, 0, 0, 64, 0, 1, + 0, 101, 2, 0, 0, 89, 8, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 193, 0, 0, 0, 95, 0, 0, + 3, 242, 16, 16, 0, 0, 0, 0, + 0, 95, 0, 0, 3, 242, 16, 16, + 0, 1, 0, 0, 0, 95, 0, 0, + 3, 114, 16, 16, 0, 2, 0, 0, + 0, 95, 0, 0, 3, 114, 16, 16, + 0, 3, 0, 0, 0, 95, 0, 0, + 3, 50, 16, 16, 0, 4, 0, 0, + 0, 101, 0, 0, 3, 114, 32, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 114, 32, 16, 0, 1, 0, 0, + 0, 101, 0, 0, 3, 114, 32, 16, + 0, 2, 0, 0, 0, 101, 0, 0, + 3, 50, 32, 16, 0, 3, 0, 0, + 0, 103, 0, 0, 4, 242, 32, 16, + 0, 4, 0, 0, 0, 1, 0, 0, + 0, 104, 0, 0, 2, 5, 0, 0, + 0, 105, 0, 0, 4, 0, 0, 0, + 0, 1, 0, 0, 0, 4, 0, 0, + 0, 105, 0, 0, 4, 1, 0, 0, + 0, 1, 0, 0, 0, 4, 0, 0, + 0, 54, 0, 0, 9, 114, 48, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 54, 0, 0, + 9, 114, 48, 32, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 27, 0, 0, 5, 18, 0, 16, + 0, 0, 0, 0, 0, 10, 16, 16, + 0, 0, 0, 0, 0, 38, 0, 0, + 8, 0, 208, 0, 0, 34, 0, 16, + 0, 0, 0, 0, 0, 10, 0, 16, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 3, 0, 0, 0, 56, 0, 0, + 10, 242, 0, 16, 0, 1, 0, 0, + 0, 6, 16, 16, 0, 1, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 35, 0, 0, + 15, 50, 0, 16, 0, 0, 0, 0, + 0, 6, 0, 16, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2, 64, 0, + 0, 1, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 56, 0, 0, 10, 242, 0, 16, + 0, 2, 0, 0, 0, 6, 16, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 13, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 10, 242, 0, 16, + 0, 0, 0, 0, 0, 6, 16, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 13, 0, 0, + 0, 26, 0, 16, 0, 0, 0, 0, + 0, 49, 0, 0, 10, 114, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 150, 23, 16, 0, 1, 0, 0, + 0, 31, 0, 4, 3, 10, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 26, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 130, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 13, 0, 0, + 0, 58, 0, 16, 0, 3, 0, 0, + 0, 86, 21, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 146, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 86, 21, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 58, 0, 16, + 0, 3, 0, 0, 0, 86, 21, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 31, 0, 4, 3, 26, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 42, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 34, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 13, 0, 0, + 0, 26, 0, 16, 0, 3, 0, 0, + 0, 166, 26, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 50, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 166, 26, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 26, 0, 16, + 0, 3, 0, 0, 0, 166, 26, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 31, 0, 4, 3, 42, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 58, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 34, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 13, 0, 0, + 0, 26, 0, 16, 0, 3, 0, 0, + 0, 246, 31, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 50, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 246, 31, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 13, 0, 0, 0, 26, 0, 16, + 0, 3, 0, 0, 0, 246, 31, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 54, 0, 0, 5, 114, 0, 16, + 0, 3, 0, 0, 0, 70, 18, 16, + 0, 3, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 17, 0, 0, 7, 18, 0, 16, + 0, 4, 0, 0, 0, 70, 14, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 1, 0, 0, 0, 17, 0, 0, + 7, 34, 0, 16, 0, 4, 0, 0, + 0, 70, 14, 16, 0, 3, 0, 0, + 0, 70, 14, 16, 0, 2, 0, 0, + 0, 17, 0, 0, 7, 66, 0, 16, + 0, 4, 0, 0, 0, 70, 14, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 16, 0, 0, + 7, 18, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 70, 2, 16, 0, 1, 0, 0, + 0, 16, 0, 0, 7, 34, 0, 16, + 0, 1, 0, 0, 0, 70, 18, 16, + 0, 2, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 16, 0, 0, + 7, 66, 0, 16, 0, 1, 0, 0, + 0, 70, 18, 16, 0, 2, 0, 0, + 0, 70, 2, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 4, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 128, 63, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 4, 0, 0, 0, 17, 0, 0, + 8, 34, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 4, 0, 0, 0, 17, 0, 0, + 8, 66, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 70, 14, 16, + 0, 4, 0, 0, 0, 17, 0, 0, + 8, 130, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 4, 0, 0, 0, 0, 0, 0, + 9, 114, 0, 16, 0, 2, 0, 0, + 0, 70, 2, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 70, 130, 32, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 54, 0, 0, 5, 130, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 0, 48, 0, 0, + 1, 33, 0, 0, 7, 130, 0, 16, + 0, 2, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 3, 0, 4, + 3, 58, 0, 16, 0, 2, 0, 0, + 0, 54, 0, 0, 6, 114, 48, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, + 0, 30, 0, 0, 7, 130, 0, 16, + 0, 1, 0, 0, 0, 58, 0, 16, + 0, 1, 0, 0, 0, 1, 64, 0, + 0, 1, 0, 0, 0, 22, 0, 0, + 1, 0, 0, 0, 9, 114, 0, 16, + 0, 2, 0, 0, 0, 70, 2, 16, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 12, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 1, 33, 0, 0, + 7, 130, 0, 16, 0, 2, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 3, 0, 4, 3, 58, 0, 16, + 0, 2, 0, 0, 0, 54, 0, 0, + 6, 114, 48, 32, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 70, 2, 16, + 0, 2, 0, 0, 0, 30, 0, 0, + 7, 130, 0, 16, 0, 1, 0, 0, + 0, 58, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 1, 0, 0, + 0, 22, 0, 0, 1, 16, 0, 0, + 8, 18, 32, 16, 0, 0, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 8, 34, 32, 16, 0, 0, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 5, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 16, 0, 0, + 8, 66, 32, 16, 0, 0, 0, 0, + 0, 70, 130, 32, 0, 0, 0, 0, + 0, 6, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 17, 0, 0, + 8, 18, 32, 16, 0, 4, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 7, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 1, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 34, 0, 16, 0, 1, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 10, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 6, 34, 32, 16, 0, 4, 0, 0, + 0, 10, 0, 16, 128, 65, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 7, 34, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 26, 0, 16, 0, 1, 0, 0, + 0, 56, 0, 0, 7, 66, 32, 16, + 0, 4, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 0, 0, 0, 63, 54, 0, 0, + 6, 114, 32, 16, 0, 1, 0, 0, + 0, 70, 50, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 54, 0, 0, + 6, 114, 32, 16, 0, 2, 0, 0, + 0, 70, 50, 32, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 130, 32, 16, 0, 4, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 50, 0, 0, 15, 50, 32, 16, + 0, 3, 0, 0, 0, 70, 16, 16, + 0, 4, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 128, 63, 0, 0, 128, +191, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 128, 63, 0, 0, 0, + 0, 0, 0, 0, 0, 62, 0, 0, + 1, 83, 84, 65, 84, 116, 0, 0, + 0, 77, 0, 0, 0, 5, 0, 0, + 0, 0, 0, 0, 0, 10, 0, 0, + 0, 36, 0, 0, 0, 12, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 5, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 82, 68, 69, + 70, 240, 1, 0, 0, 1, 0, 0, + 0, 72, 0, 0, 0, 1, 0, 0, + 0, 28, 0, 0, 0, 0, 4, 254, +255, 0, 65, 0, 0, 188, 1, 0, + 0, 60, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 36, 71, 108, 111, 98, 97, 108, +115, 0, 171, 171, 171, 60, 0, 0, + 0, 6, 0, 0, 0, 96, 0, 0, + 0, 16, 12, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 240, 0, 0, + 0, 0, 0, 0, 0, 64, 0, 0, + 0, 2, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 16, 1, 0, + 0, 64, 0, 0, 0, 44, 0, 0, + 0, 2, 0, 0, 0, 36, 1, 0, + 0, 0, 0, 0, 0, 52, 1, 0, + 0, 112, 0, 0, 0, 64, 0, 0, + 0, 2, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 64, 1, 0, + 0, 176, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 92, 1, 0, + 0, 0, 0, 0, 0, 108, 1, 0, + 0, 192, 0, 0, 0, 12, 0, 0, + 0, 2, 0, 0, 0, 136, 1, 0, + 0, 0, 0, 0, 0, 152, 1, 0, + 0, 208, 0, 0, 0, 64, 11, 0, + 0, 2, 0, 0, 0, 172, 1, 0, + 0, 0, 0, 0, 0, 95, 67, 67, + 95, 77, 86, 77, 97, 116, 114, 105, +120, 0, 171, 171, 171, 3, 0, 3, + 0, 4, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 95, 67, 67, + 95, 78, 111, 114, 109, 97, 108, 77, + 97, 116, 114, 105, 120, 0, 171, 171, +171, 3, 0, 3, 0, 3, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 80, 77, 97, +116, 114, 105, 120, 0, 95, 117, 95, + 80, 111, 105, 110, 116, 76, 105, 103, +104, 116, 83, 111, 117, 114, 99, 101, + 80, 111, 115, 105, 116, 105, 111, 110, + 0, 1, 0, 3, 0, 1, 0, 3, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 83, 112, 111, 116, + 76, 105, 103, 104, 116, 83, 111, 117, +114, 99, 101, 80, 111, 115, 105, 116, +105, 111, 110, 0, 171, 1, 0, 3, + 0, 1, 0, 3, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 95, 117, 95, +109, 97, 116, 114, 105, 120, 80, 97, +108, 101, 116, 116, 101, 0, 171, 171, +171, 1, 0, 3, 0, 1, 0, 4, + 0, 180, 0, 0, 0, 0, 0, 0, + 0, 77, 105, 99, 114, 111, 115, 111, +102, 116, 32, 40, 82, 41, 32, 72, + 76, 83, 76, 32, 83, 104, 97, 100, +101, 114, 32, 67, 111, 109, 112, 105, +108, 101, 114, 32, 54, 46, 51, 46, + 57, 54, 48, 48, 46, 49, 54, 51, + 56, 52, 0, 171, 171, 73, 83, 71, + 78, 140, 0, 0, 0, 5, 0, 0, + 0, 8, 0, 0, 0, 128, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 15, 15, 0, 0, 128, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 15, 15, 0, 0, 128, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 7, 7, 0, 0, 128, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 7, 7, 0, 0, 128, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 4, 0, 0, + 0, 3, 3, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 171, 171, +171, 79, 83, 71, 78, 152, 0, 0, + 0, 5, 0, 0, 0, 8, 0, 0, + 0, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 0, 0, 0, 7, 8, 0, + 0, 128, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 3, 12, 0, + 0, 137, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 3, 0, 0, + 0, 4, 0, 0, 0, 15, 0, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 83, 86, 95, 80, 111, 115, +105, 116, 105, 111, 110, 0, 171, 171, +171, +}; + const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { 166, 147, 0, 0, 142, 9, 2, 1, @@ -6094,7 +10328,7 @@ const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 5, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -194, 137, 0, 0, 0, 0, 0, 0, +107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 223, 173, 203, 80, 172, 13, 170, 215, 168, 128, 228, 5, @@ -6526,7 +10760,7 @@ const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 144, 4, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, @@ -6856,8 +11090,8 @@ const unsigned char s_E2D56227712263272BD5218FEA117CD06180F81B[] = { 117, 95, 112, 111, 105, 110, 116, 83, 105, 122, 101, 0, 0, 0, 0, 2, 0, 0, 0, 204, 2, 0, 0, 208, - 4, 0, 0, 0, 0, 0, 0, 194, -137, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 107, +155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, 125, @@ -7207,7 +11441,7 @@ const unsigned char s_F46558C274182079784898CF4968CF431593D5E2[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 108, 6, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 194, 137, 0, 0, 0, 0, + 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 47, 220, 115, 183, 137, 174, 141, 96, 204, 60, @@ -7663,7 +11897,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 156, 3, 0, 0, 144, 4, 0, 0, 0, - 0, 0, 0, 194, 137, 0, 0, 0, + 0, 0, 0, 107, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 203, 117, 183, 110, 154, 52, 220, 70, 125, @@ -7929,7 +12163,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { 105, 111, 110, 0, 171, 171, 171, }; -const int s_numPrograms = 18; -const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3073,2559,3300,3350,10261,3025,3556,2502,2675,3746,2775}; -const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D,s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6}; -const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D","7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"}; +const int s_numPrograms = 21; +const int s_programLengths[] = {2990,2528,4102,8993,3022,2996,3358,2982,3073,2559,3300,3350,8475,10261,3025,16289,3556,2502,2675,3746,2775}; +const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_2CF9793879165058483EFB4AD6FA9746ECD7DD2A,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D,s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_93D31E1668075AE4941C53441D7A9D0DE8F76331,s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE,s_A2377A827972A5466DA8637681045D32DA8A817D,s_A883DF8204EA77D28BC638CEAAB512DEE74FBB65,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6}; +const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","2CF9793879165058483EFB4AD6FA9746ECD7DD2A","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D","7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","93D31E1668075AE4941C53441D7A9D0DE8F76331","976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE","A2377A827972A5466DA8637681045D32DA8A817D","A883DF8204EA77D28BC638CEAAB512DEE74FBB65","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"}; diff --git a/cocos/renderer/CCGLProgram.cpp b/cocos/renderer/CCGLProgram.cpp index bdc8abe54e..e484aceea4 100644 --- a/cocos/renderer/CCGLProgram.cpp +++ b/cocos/renderer/CCGLProgram.cpp @@ -39,7 +39,7 @@ THE SOFTWARE. #include "deprecated/CCString.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || defined(WP8_SHADER_COMPILER) #include "CCPrecompiledShaders.h" #endif @@ -177,7 +177,7 @@ GLProgram::~GLProgram() bool GLProgram::initWithByteArrays(const GLchar* vShaderByteArray, const GLchar* fShaderByteArray) { -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) GLboolean hasCompiler = false; glGetBooleanv(GL_SHADER_COMPILER, &hasCompiler); _hasShaderCompiler = (hasCompiler == GL_TRUE); @@ -226,14 +226,14 @@ bool GLProgram::initWithByteArrays(const GLchar* vShaderByteArray, const GLchar* CHECK_GL_ERROR_DEBUG(); -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || defined(WP8_SHADER_COMPILER) _shaderId = CCPrecompiledShaders::getInstance()->addShaders(vShaderByteArray, fShaderByteArray); #endif return true; } -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) GLProgram* GLProgram::createWithPrecompiledProgramByteArray(const GLchar* vShaderByteArray, const GLchar* fShaderByteArray) { auto ret = new (std::nothrow) GLProgram(); @@ -529,7 +529,7 @@ bool GLProgram::link() { CCASSERT(_program != 0, "Cannot link invalid program"); -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) if(!_hasShaderCompiler) { // precompiled shader program is already linked @@ -562,7 +562,7 @@ bool GLProgram::link() _vertShader = _fragShader = 0; -#if DEBUG || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if DEBUG || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) glGetProgramiv(_program, GL_LINK_STATUS, &status); if (status == GL_FALSE) @@ -573,7 +573,7 @@ bool GLProgram::link() } #endif -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || defined(WP8_SHADER_COMPILER) if (status == GL_TRUE) { CCPrecompiledShaders::getInstance()->addProgram(_program, _shaderId); diff --git a/cocos/renderer/CCGLProgram.h b/cocos/renderer/CCGLProgram.h index fa02252b97..fcb7670829 100644 --- a/cocos/renderer/CCGLProgram.h +++ b/cocos/renderer/CCGLProgram.h @@ -175,7 +175,7 @@ public: * @lua initWithString */ -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) /** Initializes the CCGLProgram with precompiled shader program */ static GLProgram* createWithPrecompiledProgramByteArray(const GLchar* vShaderByteArray, const GLchar* fShaderByteArray); bool initWithPrecompiledProgramByteArray(const GLchar* vShaderByteArray, const GLchar* fShaderByteArray); @@ -343,7 +343,7 @@ protected: struct _hashUniformEntry* _hashForUniforms; bool _hasShaderCompiler; -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || defined(WP8_SHADER_COMPILER) std::string _shaderId; #endif diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp index a7eb01b4b1..1073302d9b 100644 --- a/cocos/renderer/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -1370,7 +1370,7 @@ Texture2D::PixelFormat Texture2D::getDefaultAlphaPixelFormat() unsigned int Texture2D::getBitsPerPixelForFormat(Texture2D::PixelFormat format) const { - if (format == PixelFormat::NONE) + if (format == PixelFormat::NONE || format == PixelFormat::DEFAULT) { return 0; } diff --git a/cocos/renderer/CCTextureCache.h b/cocos/renderer/CCTextureCache.h index b05eb78b86..39ff497642 100644 --- a/cocos/renderer/CCTextureCache.h +++ b/cocos/renderer/CCTextureCache.h @@ -269,7 +269,7 @@ protected: FontDefinition _fontDefinition; }; -class VolatileTextureMgr +class CC_DLL VolatileTextureMgr { public: static void addImageTexture(Texture2D *tt, const std::string& imageFileName); diff --git a/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj b/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj deleted file mode 100644 index 34e625ad9b..0000000000 --- a/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {88982C27-5A7B-40A8-86E7-B3187B44B322} - libLocalStorage - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - true - - - true - false - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters b/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters deleted file mode 100644 index b23d606b74..0000000000 --- a/cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {0310200c-b520-4f77-85f6-46f568b10f4d} - - - {69cfa37c-4b20-409e-ad74-a26314878d8a} - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/cocos/ui/GUIExport.h b/cocos/ui/GUIExport.h index 983504664f..717a0ad9e4 100644 --- a/cocos/ui/GUIExport.h +++ b/cocos/ui/GUIExport.h @@ -1,7 +1,7 @@ #ifndef __CCLIBGUI_H__ #define __CCLIBGUI_H__ -#if defined(WIN32) && defined(_WINDOWS) +#if (defined(WIN32) && defined(_WINDOWS)) || defined(WINRT) || defined(WP8) #ifdef __MINGW32__ #include #endif diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj b/cocos/ui/proj.wp8/libGUI.vcxproj deleted file mode 100644 index ca3199c465..0000000000 --- a/cocos/ui/proj.wp8/libGUI.vcxproj +++ /dev/null @@ -1,225 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {08FB23E4-1517-4EDC-B682-DA238CDAA83D} - libGUI - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - true - false - true - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - true - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - true - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - true - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj.filters b/cocos/ui/proj.wp8/libGUI.vcxproj.filters deleted file mode 100644 index d4c7c2e197..0000000000 --- a/cocos/ui/proj.wp8/libGUI.vcxproj.filters +++ /dev/null @@ -1,186 +0,0 @@ - - - - - {e31ab7d3-b8b2-467f-9e08-fd5fe168b491} - - - {f9d13563-9e5e-4b35-b0e7-d41f587efa42} - - - {ed8a2ae0-5690-4d0d-829b-7c07164c0597} - - - {5f6e9e52-fbe7-4073-ac71-98632f9e6781} - - - {b59b178a-b7e0-4826-ba07-44c46cd29a10} - - - - - Layouts - - - Layouts - - - System - - - System - - - UIWidgets\ScrollWidget - - - UIWidgets\ScrollWidget - - - UIWidgets\ScrollWidget - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - BaseClasses - - - Layouts - - - UIWidgets - - - Layouts - - - Layouts - - - System - - - BaseClasses - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - Layouts - - - - - Layouts - - - Layouts - - - System - - - System - - - UIWidgets\ScrollWidget - - - UIWidgets\ScrollWidget - - - UIWidgets\ScrollWidget - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - UIWidgets - - - BaseClasses - - - Layouts - - - UIWidgets - - - Layouts - - - Layouts - - - System - - - BaseClasses - - - UIWidgets - - - UIWidgets - - - Layouts - - - \ No newline at end of file diff --git a/extensions/ExtensionExport.h b/extensions/ExtensionExport.h index 5360f249b1..837df61c54 100644 --- a/extensions/ExtensionExport.h +++ b/extensions/ExtensionExport.h @@ -1,7 +1,7 @@ #ifndef __CCEXTENSIONEXPORT_H__ #define __CCEXTENSIONEXPORT_H__ -#if defined(WIN32) && defined(_WINDOWS) +#if (defined(WIN32) && defined(_WINDOWS)) || defined(WINRT) || defined(WP8) #ifdef __MINGW32__ #include #endif diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp index 241243199b..d3f57bb3e4 100644 --- a/extensions/assets-manager/AssetsManager.cpp +++ b/extensions/assets-manager/AssetsManager.cpp @@ -450,7 +450,16 @@ bool AssetsManager::uncompress() */ bool AssetsManager::createDirectory(const char *path) { -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) + return FileUtils::getInstance()->createDirectory(_storagePath.c_str()); +#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + BOOL ret = CreateDirectoryA(path, nullptr); + if (!ret && ERROR_ALREADY_EXISTS != GetLastError()) + { + return false; + } + return true; +#else mode_t processMask = umask(0); int ret = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO); umask(processMask); @@ -458,16 +467,11 @@ bool AssetsManager::createDirectory(const char *path) { return false; } - - return true; -#else - BOOL ret = CreateDirectoryA(path, nullptr); - if (!ret && ERROR_ALREADY_EXISTS != GetLastError()) - { - return false; - } + return true; #endif + + } void AssetsManager::setSearchPath() @@ -638,19 +642,20 @@ AssetsManager* AssetsManager::create(const char* packageUrl, const char* version void AssetsManager::createStoragePath() { // Remove downloaded files -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) + FileUtils::getInstance()->createDirectory(_storagePath.c_str()); +#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + if ((GetFileAttributesA(_storagePath.c_str())) == INVALID_FILE_ATTRIBUTES) + { + CreateDirectoryA(_storagePath.c_str(), 0); + } +#else DIR *dir = nullptr; - dir = opendir (_storagePath.c_str()); if (!dir) { mkdir(_storagePath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); } -#else - if ((GetFileAttributesA(_storagePath.c_str())) == INVALID_FILE_ATTRIBUTES) - { - CreateDirectoryA(_storagePath.c_str(), 0); - } #endif } @@ -660,16 +665,18 @@ void AssetsManager::destroyStoragePath() deleteVersion(); // Remove downloaded files -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) - string command = "rm -r "; - // Path may include space. - command += "\"" + _storagePath + "\""; - system(command.c_str()); -#else +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) + FileUtils::getInstance()->removeDirectory(_storagePath.c_str()); +#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) string command = "rd /s /q "; // Path may include space. command += "\"" + _storagePath + "\""; system(command.c_str()); +#else + string command = "rm -r "; + // Path may include space. + command += "\"" + _storagePath + "\""; + system(command.c_str()); #endif } diff --git a/extensions/proj.wp8/libExtensions.vcxproj b/extensions/proj.wp8/libExtensions.vcxproj deleted file mode 100644 index 53fd84de79..0000000000 --- a/extensions/proj.wp8/libExtensions.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4} - Extensions.win32 - en-US - 11.0 - - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - StaticLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - false - - - - _LIB;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - pch.h - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - pch.h - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - pch.h - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - _LIB;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) - 4267;4251;4244;%(DisableSpecificWarnings) - pch.h - /Zm200 %(AdditionalOptions) - - - Console - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - false - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/extensions/proj.wp8/libExtensions.vcxproj.filters b/extensions/proj.wp8/libExtensions.vcxproj.filters deleted file mode 100644 index 2a3c131354..0000000000 --- a/extensions/proj.wp8/libExtensions.vcxproj.filters +++ /dev/null @@ -1,127 +0,0 @@ - - - - - {202b519b-b5e0-499f-b3b8-ed5da144b248} - - - {c07abd14-e9dd-4e2d-85c4-a180070161b4} - - - {46797895-f71d-4ddb-b381-d0884e678d39} - - - {d5806151-7ae1-4fef-af5a-2fa1d1c7377b} - - - {49487dbe-5758-436a-b014-8e2edc6b33ae} - - - - - GUI\CCScrollView - - - GUI\CCScrollView - - - GUI\CCScrollView - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - physics_nodes - - - physics_nodes - - - - - - GUI\CCScrollView - - - - - GUI\CCScrollView - - - GUI\CCScrollView - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - GUI\CCControlExtension - - - physics_nodes - - - physics_nodes - - - - \ No newline at end of file diff --git a/extensions/proj.wp8/pch.cpp b/extensions/proj.wp8/pch.cpp deleted file mode 100644 index bcb5590be1..0000000000 --- a/extensions/proj.wp8/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/extensions/proj.wp8/pch.h b/extensions/proj.wp8/pch.h deleted file mode 100644 index 4c3b8cde28..0000000000 --- a/extensions/proj.wp8/pch.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "cocos2d.h" -#include "cocos-ext.h" -#include "ExtensionMacros.h" diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj index cb1022aa77..001e96c4c4 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj @@ -62,20 +62,24 @@ - - + + + - - + + + - - + + + - - + + + @@ -83,7 +87,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -103,7 +107,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -123,7 +127,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -143,7 +147,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -167,113 +171,42 @@ false - - - {b5af91b3-64ea-44e1-84b0-d759e93758fb} - - - {df125891-eee9-4466-b903-f828fd272158} - - - {20d4035d-fd3f-4fd3-baba-97bc1c38dfc2} - - - {51e5736e-e1a3-4c94-abb7-e92ecef9c12e} - - - {7d4fc6eb-9497-4804-98f3-3eaedc896154} - - - {7daa99e7-8e07-4fef-8374-8ec04e395d2e} - - - {88982c27-5a7b-40a8-86e7-b3187b44b322} - - - {08fb23e4-1517-4edc-b682-da238cdaa83d} - - - {04a0c42f-23bb-469b-a9d8-ca49136adbd4} - - - {c55734a3-702c-4fa1-b950-32c8e169302f} - - - - Create - Create - Create - Create - + + Create + Create + Create + Create + - + - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - + + {7c5dbc42-27f6-4978-aabc-02ba77e2a7f0} + + + {7d4fc6eb-9497-4804-98f3-3eaedc896154} + + + {c55734a3-702c-4fa1-b950-32c8e169302f} + diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters index 635d66d9ae..ec4cf74ac2 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters @@ -1,21 +1,20 @@  - - platform_src + src - platform_src + src - platform_src + src - platform_src + src - platform_src + src Classes @@ -23,26 +22,28 @@ Classes + + src + - - platform_src + src - platform_src + src - platform_src + src - platform_src + src - platform_src + src - platform_src + src Classes @@ -50,27 +51,25 @@ Classes + + src + - - {6fcff44b-bb9f-4ed9-8553-558855bc91e3} - {ddb0f381-1dc4-44a0-ab28-0f672a551265} + + {6fcff44b-bb9f-4ed9-8553-558855bc91e3} + - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.cpp deleted file mode 100644 index bcb5590be1..0000000000 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.h b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.h deleted file mode 100644 index 5e0bbb907c..0000000000 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "cocos2d.h" diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp index 608cc6f828..d0d5a5f61c 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "Cocos2dRenderer.h" #include "cocos2d.h" #include "CCApplication.h" -#include "CCGLViewImpl.h" +#include "CCGLViewImpl-wp8.h" #include "AppDelegate.h" #include @@ -56,11 +56,11 @@ void Cocos2dRenderer::CreateGLResources() GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height,m_orientation); director->setOpenGLView(glview); - CCApplication::getInstance()->run(); glview->SetXamlEventDelegate(m_delegate); glview->SetXamlMessageBoxDelegate(m_messageBoxDelegate); glview->SetXamlEditBoxDelegate(m_editBoxDelegate); - } + CCApplication::getInstance()->run(); + } else { cocos2d::GL::invalidateStateCache(); @@ -71,7 +71,7 @@ void Cocos2dRenderer::CreateGLResources() director->getEventDispatcher()->dispatchEvent(&recreatedEvent); cocos2d::Application::getInstance()->applicationWillEnterForeground(); director->setGLDefaultValues(); - } + } m_loadingComplete = true; } diff --git a/cocos/editor-support/cocosbuilder/proj.wp8/pch.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/pch.cpp similarity index 100% rename from cocos/editor-support/cocosbuilder/proj.wp8/pch.cpp rename to templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/pch.cpp diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/pch.h b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/pch.h new file mode 100644 index 0000000000..5dbe96eb9f --- /dev/null +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/pch.h @@ -0,0 +1,11 @@ +#pragma once + +#include "targetver.h" + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include +#include "cocos2d.h" +#include "cocos-ext.h" \ No newline at end of file diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln index 40aa8942b1..e70edfa5b2 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln +++ b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln @@ -1,30 +1,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCpp", "App\HelloCpp.csproj", "{83CC88FE-7E79-4E1E-A129-742987130B5C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCppComponent", "AppComponent\HelloCppComponent.vcxproj", "{60EC6889-C3C4-45AD-A006-47D9EE689212}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "..\cocos2d\cocos\audio\proj.wp8\CocosDenshion.vcxproj", "{DF125891-EEE9-4466-B903-F828FD272158}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\cocos2d\extensions\proj.wp8\libExtensions.vcxproj", "{04A0C42F-23BB-469B-A9D8-CA49136ADBD4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos2d\cocos\editor-support\cocosbuilder\proj.wp8\libCocosBuilder.vcxproj", "{20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos2d\cocos\editor-support\cocostudio\proj.wp8\libCocosStudio.vcxproj", "{51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos2d\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos2d\cocos\storage\local-storage\proj.wp8\libLocalStorage.vcxproj", "{88982C27-5A7B-40A8-86E7-B3187B44B322}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos2d\cocos\ui\proj.wp8\libGUI.vcxproj", "{08FB23E4-1517-4EDC-B682-DA238CDAA83D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{1CD6A64E-A2B6-49BC-A5DC-25122C07166A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\cocos2d\external\Box2D\proj.wp8\Box2D.vcxproj", "{C55734A3-702C-4FA1-B950-32C8E169302F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos2d\cocos\network\proj.wp8\libNetwork.vcxproj", "{7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos2d\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_wp8", "..\cocos2d\cocos\2d\libcocos2d_wp8.vcxproj", "{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -88,150 +76,6 @@ Global {60EC6889-C3C4-45AD-A006-47D9EE689212}.Release|Win32.Build.0 = Release|Win32 {60EC6889-C3C4-45AD-A006-47D9EE689212}.Release|x86.ActiveCfg = Release|Win32 {60EC6889-C3C4-45AD-A006-47D9EE689212}.Release|x86.Build.0 = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|ARM.ActiveCfg = Debug|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|ARM.Build.0 = Debug|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|Win32.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|x86.ActiveCfg = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Debug|x86.Build.0 = Debug|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Any CPU.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|ARM.ActiveCfg = Release|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|ARM.Build.0 = Release|ARM - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Mixed Platforms.Build.0 = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Win32.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|Win32.Build.0 = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|x86.ActiveCfg = Release|Win32 - {B5AF91B3-64EA-44E1-84B0-D759E93758FB}.Release|x86.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|ARM.ActiveCfg = Debug|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|ARM.Build.0 = Debug|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|Win32.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|x86.ActiveCfg = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Debug|x86.Build.0 = Debug|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Any CPU.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|ARM.ActiveCfg = Release|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Release|ARM.Build.0 = Release|ARM - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Mixed Platforms.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Win32.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|Win32.Build.0 = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|x86.ActiveCfg = Release|Win32 - {DF125891-EEE9-4466-B903-F828FD272158}.Release|x86.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|ARM.ActiveCfg = Debug|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|ARM.Build.0 = Debug|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Win32.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|Win32.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|x86.ActiveCfg = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Debug|x86.Build.0 = Debug|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Any CPU.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|ARM.ActiveCfg = Release|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|ARM.Build.0 = Release|ARM - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Mixed Platforms.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Win32.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|Win32.Build.0 = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|x86.ActiveCfg = Release|Win32 - {04A0C42F-23BB-469B-A9D8-CA49136ADBD4}.Release|x86.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|ARM.ActiveCfg = Debug|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|ARM.Build.0 = Debug|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|Win32.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|x86.ActiveCfg = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Debug|x86.Build.0 = Debug|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Any CPU.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|ARM.ActiveCfg = Release|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|ARM.Build.0 = Release|ARM - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Mixed Platforms.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Win32.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|Win32.Build.0 = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|x86.ActiveCfg = Release|Win32 - {20D4035D-FD3F-4FD3-BABA-97BC1C38DFC2}.Release|x86.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|ARM.ActiveCfg = Debug|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|ARM.Build.0 = Debug|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Win32.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|Win32.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|x86.ActiveCfg = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Debug|x86.Build.0 = Debug|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Any CPU.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|ARM.ActiveCfg = Release|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|ARM.Build.0 = Release|ARM - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Win32.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|Win32.Build.0 = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|x86.ActiveCfg = Release|Win32 - {51E5736E-E1A3-4C94-ABB7-E92ECEF9C12E}.Release|x86.Build.0 = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.ActiveCfg = Debug|ARM - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.Build.0 = Debug|ARM - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.Build.0 = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.ActiveCfg = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.Build.0 = Debug|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Any CPU.ActiveCfg = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.ActiveCfg = Release|ARM - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.Build.0 = Release|ARM - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.Build.0 = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.ActiveCfg = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.Build.0 = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.ActiveCfg = Release|Win32 - {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.ActiveCfg = Debug|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|ARM.Build.0 = Debug|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Win32.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|Win32.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|x86.ActiveCfg = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Debug|x86.Build.0 = Debug|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Any CPU.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|ARM.ActiveCfg = Release|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|ARM.Build.0 = Release|ARM - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Mixed Platforms.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Win32.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|Win32.Build.0 = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|x86.ActiveCfg = Release|Win32 - {88982C27-5A7B-40A8-86E7-B3187B44B322}.Release|x86.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.ActiveCfg = Debug|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.Build.0 = Debug|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Win32.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Win32.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|x86.ActiveCfg = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|x86.Build.0 = Debug|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Any CPU.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|ARM.ActiveCfg = Release|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|ARM.Build.0 = Release|ARM - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Win32.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|Win32.Build.0 = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.ActiveCfg = Release|Win32 - {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.Build.0 = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.ActiveCfg = Debug|ARM {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.Build.0 = Debug|ARM @@ -250,26 +94,48 @@ Global {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Win32.Build.0 = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.ActiveCfg = Release|Win32 {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|ARM.ActiveCfg = Debug|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|ARM.Build.0 = Debug|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|Win32.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|x86.ActiveCfg = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Debug|x86.Build.0 = Debug|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Any CPU.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|ARM.ActiveCfg = Release|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|ARM.Build.0 = Release|ARM - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Win32.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|Win32.Build.0 = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|x86.ActiveCfg = Release|Win32 - {7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}.Release|x86.Build.0 = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.ActiveCfg = Debug|ARM + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.Build.0 = Debug|ARM + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.Build.0 = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.ActiveCfg = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.Build.0 = Debug|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Any CPU.ActiveCfg = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.ActiveCfg = Release|ARM + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.Build.0 = Release|ARM + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.Build.0 = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.ActiveCfg = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.Build.0 = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.ActiveCfg = Release|Win32 + {7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.ActiveCfg = Debug|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.Build.0 = Debug|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.ActiveCfg = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.Build.0 = Debug|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Any CPU.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.ActiveCfg = Release|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.Build.0 = Release|ARM + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.Build.0 = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.ActiveCfg = Release|Win32 + {7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C55734A3-702C-4FA1-B950-32C8E169302F} = {1CD6A64E-A2B6-49BC-A5DC-25122C07166A} + {7D4FC6EB-9497-4804-98F3-3EAEDC896154} = {1CD6A64E-A2B6-49BC-A5DC-25122C07166A} + EndGlobalSection EndGlobal diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj index 0f318527ab..17bf7f73e5 100644 --- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj +++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj @@ -62,20 +62,24 @@ - - + + + - - + + + - - + + + - - + + + @@ -83,7 +87,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -96,15 +100,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);$(EngineRoot)external\protocolBuf\prebuilt\wp8\$(Platform)\debug;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -117,15 +121,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);$(EngineRoot)external\protocolBuf\prebuilt\wp8\$(Platform)\release;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -138,15 +142,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -159,10 +163,10 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) @@ -172,6 +176,12 @@ + + Create + Create + Create + Create + @@ -179,18 +189,9 @@ - - Create - Create - Create - Create - false - false - false - false - + @@ -200,90 +201,18 @@ - - - {b5af91b3-64ea-44e1-84b0-d759e93758fb} - - - {df125891-eee9-4466-b903-f828fd272158} - - - {20d4035d-fd3f-4fd3-baba-97bc1c38dfc2} - - - {51e5736e-e1a3-4c94-abb7-e92ecef9c12e} + + {7c5dbc42-27f6-4978-aabc-02ba77e2a7f0} {7d4fc6eb-9497-4804-98f3-3eaedc896154} - - {7daa99e7-8e07-4fef-8374-8ec04e395d2e} - - - {88982c27-5a7b-40a8-86e7-b3187b44b322} - - - {08fb23e4-1517-4edc-b682-da238cdaa83d} - - - {04a0c42f-23bb-469b-a9d8-ca49136adbd4} - {c55734a3-702c-4fa1-b950-32c8e169302f} - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj.filters b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj.filters index 9180508691..7992bf66f7 100644 --- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj.filters +++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj.filters @@ -12,12 +12,12 @@ Classes - + @@ -29,26 +29,21 @@ Classes - + - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index ac9a97a470..29d2a7e918 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -62,20 +62,24 @@ - - + + + - - + + + - - + + + - - + + + @@ -89,7 +93,7 @@ - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -102,15 +106,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -123,15 +127,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -144,15 +148,15 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) - WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) @@ -165,10 +169,10 @@ Console false - d3d11.lib;libGLESv2_phone.lib;libEGL_phone.lib;xaudio2.lib;libwebsockets.lib;libcurl.lib;%(AdditionalDependencies) + %(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - $(EngineRoot)external\wp8-specific\angle\prebuilt\$(Platform);$(EngineRoot)\external\curl\prebuilt\wp8\$(Platform);$(EngineRoot)external\websockets\prebuilt\wp8\$(Platform);%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) @@ -178,6 +182,12 @@ + + Create + Create + Create + Create + @@ -362,18 +372,9 @@ - - Create - Create - Create - Create - false - false - false - false - + @@ -625,90 +626,18 @@ - - - {b5af91b3-64ea-44e1-84b0-d759e93758fb} - - - {df125891-eee9-4466-b903-f828fd272158} - - - {20d4035d-fd3f-4fd3-baba-97bc1c38dfc2} - - - {51e5736e-e1a3-4c94-abb7-e92ecef9c12e} + + {7c5dbc42-27f6-4978-aabc-02ba77e2a7f0} {7d4fc6eb-9497-4804-98f3-3eaedc896154} - - {7daa99e7-8e07-4fef-8374-8ec04e395d2e} - - - {88982c27-5a7b-40a8-86e7-b3187b44b322} - - - {08fb23e4-1517-4edc-b682-da238cdaa83d} - - - {04a0c42f-23bb-469b-a9d8-ca49136adbd4} - {c55734a3-702c-4fa1-b950-32c8e169302f} - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index 1405c62cde..56a6c2d875 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -329,7 +329,10 @@ {f3b97ed6-a90e-4abc-b916-f91da5de888d} - {a7609300-6bd1-4671-9a1d-0ab8a4c3f54d} + {e5476084-161e-4bfc-9f08-1dcd000dd122} + + + {af74683d-52b5-41a8-b153-62d2609b0035} @@ -675,7 +678,6 @@ Classes\ConfigurationTest - Classes\ExtensionsTest\NetworkTest @@ -864,7 +866,6 @@ Classes\Camera3DTest - Classes\BillBoardTest @@ -874,6 +875,10 @@ Classes\LightTest + + + Classes\UITest\CocosStudioGUITest\UIEditBoxTest + @@ -1416,7 +1421,6 @@ Classes\ShaderTest - Classes\ExtensionsTest\NetworkTest @@ -1606,7 +1610,6 @@ Classes\Camera3DTest - Classes\BillBoardTest @@ -1616,19 +1619,18 @@ Classes\LightTest + + + Classes\UITest\CocosStudioGUITest\UIEditBoxTest + - - - - - - - - - - - - + + + + + + + \ No newline at end of file