diff --git a/README.md b/README.md
index 86c99154be..d2fef9b64b 100644
--- a/README.md
+++ b/README.md
@@ -89,11 +89,15 @@ Run
### Build and run new project for Windows 8.1 and Windows Phone 8.1 ###
- $ cocos new MyGame -p com.bar.foo -l cpp -d projects
+ $ cocos new MyGame -p com.your_company.mygame -l cpp -d projects
-With the Cocos2d-x v3.3, you can create Universal App (Two projects at the same time: Windows(Tablet) and Windows Phone 8.1 )
+Visual Studio 2013 Update 4 or later is required.
+
+Starting with Cocos2d-x v3.3, you can create Windows 8.1 Universal Apps (Windows Store and Windows Phone 8.1)
See more info on How to install and Create games on Windows RT (Windows and Windows Phone 8.1) at http://msopentech.github.io/cocos2d-x/
+Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8.0
+
Main features
-------------
* Scene management (workflow)
@@ -184,6 +188,10 @@ $ bin/lua-empty-test/lua-empty-test
Open the `cocos2d-x/build/cocos2d-win32.vc2012.sln`
+* For Windows 8.1 Universal Apps (Phone and Store)
+
+Open the `cocos2d-x/build/cocos2d-win8.1-universal.sln`
+
* For Android
```
diff --git a/build/cocos2d-wp8.sln b/build/cocos2d-wp8.sln
deleted file mode 100644
index 1929d02839..0000000000
--- a/build/cocos2d-wp8.sln
+++ /dev/null
@@ -1,247 +0,0 @@
-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}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\external\Box2D\proj.wp8\Box2D.vcxproj", "{C55734A3-702C-4FA1-B950-32C8E169302F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-tests-wp8-xaml", "cpp-tests-wp8-xaml", "{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}"
- ProjectSection(ProjectDependencies) = postProject
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
- EndProjectSection
-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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-empty-test-wp8-xaml", "cpp-empty-test-wp8-xaml", "{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}"
- ProjectSection(ProjectDependencies) = postProject
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}
- EndProjectSection
-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}") = "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}
- {60D53713-1675-4466-81DC-D67A031C3D21} = {60D53713-1675-4466-81DC-D67A031C3D21}
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
- {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
- Debug|ARM = Debug|ARM
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|ARM = Release|ARM
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {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|x64.ActiveCfg = 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|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
- {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
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Win32.ActiveCfg = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Win32.Build.0 = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x64.ActiveCfg = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x86.ActiveCfg = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x86.Build.0 = Debug|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Any CPU.ActiveCfg = Release|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|ARM.ActiveCfg = Release|ARM
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|ARM.Build.0 = Release|ARM
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Mixed Platforms.Build.0 = Release|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Win32.ActiveCfg = Release|Win32
- {C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Win32.Build.0 = Release|Win32
- {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
- {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
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.ActiveCfg = Debug|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.Build.0 = Debug|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.Deploy.0 = Debug|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.ActiveCfg = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.Build.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.Deploy.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x64.ActiveCfg = Debug|Any CPU
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.ActiveCfg = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.Build.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.Deploy.0 = Debug|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.Build.0 = Release|Any CPU
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.ActiveCfg = Release|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.Build.0 = Release|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.Deploy.0 = Release|ARM
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.Build.0 = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.Deploy.0 = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.ActiveCfg = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.Build.0 = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.Deploy.0 = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|x64.ActiveCfg = Release|Any CPU
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.ActiveCfg = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.Build.0 = Release|x86
- {60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.Deploy.0 = Release|x86
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|ARM.ActiveCfg = Debug|ARM
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|ARM.Build.0 = Debug|ARM
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Win32.ActiveCfg = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Win32.Build.0 = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x64.ActiveCfg = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x86.ActiveCfg = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x86.Build.0 = Debug|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Any CPU.ActiveCfg = Release|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|ARM.ActiveCfg = Release|ARM
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|ARM.Build.0 = Release|ARM
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Mixed Platforms.Build.0 = Release|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Win32.ActiveCfg = Release|Win32
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Win32.Build.0 = Release|Win32
- {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
- {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
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.ActiveCfg = Debug|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.Build.0 = Debug|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.Deploy.0 = Debug|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.ActiveCfg = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.Build.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.Deploy.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x64.ActiveCfg = Debug|Any CPU
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.ActiveCfg = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.Build.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.Deploy.0 = Debug|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.Build.0 = Release|Any CPU
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.ActiveCfg = Release|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.Build.0 = Release|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.Deploy.0 = Release|ARM
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.Build.0 = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.Deploy.0 = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.ActiveCfg = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.Build.0 = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.Deploy.0 = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x64.ActiveCfg = Release|Any CPU
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.ActiveCfg = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.Build.0 = Release|x86
- {5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.Deploy.0 = Release|x86
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|ARM.ActiveCfg = Debug|ARM
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|ARM.Build.0 = Debug|ARM
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Win32.ActiveCfg = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Win32.Build.0 = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x64.ActiveCfg = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x86.ActiveCfg = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x86.Build.0 = Debug|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Any CPU.ActiveCfg = Release|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|ARM.ActiveCfg = Release|ARM
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|ARM.Build.0 = Release|ARM
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Mixed Platforms.Build.0 = Release|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Win32.ActiveCfg = Release|Win32
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Win32.Build.0 = Release|Win32
- {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
- {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
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.ActiveCfg = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.Build.0 = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x64.ActiveCfg = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.ActiveCfg = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.Build.0 = Debug|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Any CPU.ActiveCfg = Release|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.ActiveCfg = Release|ARM
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.Build.0 = Release|ARM
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.Build.0 = Release|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.ActiveCfg = Release|Win32
- {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.Build.0 = Release|Win32
- {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
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {60D53713-1675-4466-81DC-D67A031C3D21} = {671E147E-1DBD-41FC-99B3-2119CA828C8A}
- {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {671E147E-1DBD-41FC-99B3-2119CA828C8A}
- {5921FE12-7EF3-4847-8453-42EF286DDBE7} = {2C306303-EB4F-4058-8CA0-1F28A4FECE39}
- {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {2C306303-EB4F-4058-8CA0-1F28A4FECE39}
- EndGlobalSection
-EndGlobal
diff --git a/build/winrt/angle.bat b/build/winrt/angle.bat
deleted file mode 100644
index 13bbf9f607..0000000000
--- a/build/winrt/angle.bat
+++ /dev/null
@@ -1,63 +0,0 @@
-set IN_DIR=.\..\..\..\angle\src\WP8\redist\vs2012\ARM\Release
-
-set OUT_DIR=.\..\..\external\wp8-specific\angle\prebuilt\ARM\
-xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
-
-
-
-set IN_DIR=.\..\..\..\angle\src\WP8\redist\vs2012\Win32\Release
-
-set OUT_DIR=.\..\..\external\wp8-specific\angle\prebuilt\Win32\
-
-
-xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
-
-
-
-set IN_DIR=.\..\..\..\angle\src\WinRT\redist\vs2013\ARM\Release\
-set OUT_DIR=.\..\..\external\winrt-specific\angle\prebuilt\ARM\
-xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
-
-
-set IN_DIR=.\..\..\..\angle\src\WinRT\redist\vs2013\Win32\Release\
-set OUT_DIR=.\..\..\external\winrt-specific\angle\prebuilt\Win32\
-xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
-
-xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
-
-
-set OUT_DIR=.\..\..\external\winrt-specific\angle\include
-xcopy ".\..\..\..\angle\include" "%OUT_DIR%" /eiycq
-xcopy ".\..\..\..\angle\src\common\winrtangle.h" "%OUT_DIR%" /iycq
-xcopy ".\..\..\..\angle\samples\gles2_book\Common\esUtil.h" "%OUT_DIR%" /iycq
-
diff --git a/build/winrt/convertprojects.ps1 b/build/winrt/convertprojects.ps1
deleted file mode 100644
index 0fe0e2c212..0000000000
--- a/build/winrt/convertprojects.ps1
+++ /dev/null
@@ -1,83 +0,0 @@
-. ".\scripts\createsln.ps1"
-. ".\scripts\converterutils.ps1"
-. ".\scripts\winrtconverter.ps1"
-
-
-$workingDir = $PSScriptRoot
-
-
-$cocosDir = join-path $workingDir "..\..\cocos" -Resolve
-$libGUI = join-path $cocosDir "\gui\proj.wp8\libGUI.vcxproj"
-$in = join-path $cocosDir "\gui\proj.win32\libGUI.vcxproj"
-#WinrtConverter $in $libGUI "wp8" >> $null
-
-$c2dLib = join-path $cocosDir "\2d\cocos2d_wp8.vcxproj"
-$in = join-path $cocosDir "\2d\cocos2d.vcxproj"
-#WinrtConverter $in $c2dLib "wp8" >> $null
-
-$c2dLib = join-path $cocosDir "\2d\cocos2d_winrt.vcxproj"
-$in = join-path $cocosDir "\2d\cocos2d.vcxproj"
-#WinrtConverter $in $c2dLib "winrt" >> $null
-
-$libNetwork = join-path $cocosDir "\network\proj.wp8\libNetwork.vcxproj"
-$in = join-path $cocosDir "\network\proj.win32\libNetwork.vcxproj"
-#WinrtConverter $in $libNetwork "wp8" >> $null
-
-$libLocalStorage = join-path $cocosDir "\storage\local-storage\proj.wp8\libLocalStorage.vcxproj"
-$in = join-path $cocosDir "\storage\local-storage\proj.win32\libLocalStorage.vcxproj"
-#WinrtConverter $in $libLocalStorage "wp8" >> $null
-
-$libAudio = join-path $cocosDir "\audio\proj.wp8\CocosDenshion.vcxproj"
-$in = join-path $cocosDir "\audio\proj.win32\CocosDenshion.vcxproj"
-#WinrtConverter $in $libAudio "wp8" >> $null
-
-$libSpine = join-path $cocosDir "\editor-support\spine\proj.wp8\libSpine.vcxproj"
-$in = join-path $cocosDir "\editor-support\spine\proj.win32\libSpine.vcxproj"
-#WinrtConverter $in $libSpine "wp8" >> $null
-
-$libCocosStudio = join-path $cocosDir "\editor-support\cocostudio\proj.wp8\libCocosStudio.vcxproj"
-$in = join-path $cocosDir "\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj"
-#WinrtConverter $in $libCocosStudio "wp8" >> $null
-
-$libCocosBuilder = join-path $cocosDir "\editor-support\cocosbuilder\proj.wp8\libCocosBuilder.vcxproj"
-$in = join-path $cocosDir "\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj"
-#WinrtConverter $in $libCocosBuilder "wp8" >> $null
-
-$extensionsDir = join-path $workingDir "..\..\extensions" -Resolve
-$libExtensions = join-path $extensionsDir "\proj.wp8\libExtensions.vcxproj"
-#$in = join-path $extensionsDir "\proj.win32\libExtensions.vcxproj"
-#WinrtConverter $in $libExtensions "wp8" >> $null
-
-$externalDir = join-path $workingDir "..\..\external" -Resolve
-$box2dDir = join-path $workingDir "..\..\external\Box2D" -Resolve
-$libBox2d = join-path $box2dDir "\proj.wp8\Box2D.vcxproj"
-$in = join-path $box2dDir "\proj.win32\Box2D.vcxproj"
-#WinrtConverter $in $libBox2d "wp8" >> $null
-
-$freetypeDir = join-path $workingDir "..\..\external\freetype2\include\wp8" -Resolve
-$libFreetype = join-path $freetypeDir "\freetype-2.5.3\builds\windows\vc2010\freetype_wp8.vcxproj"
-$in = join-path $freetypeDir "\freetype-2.5.3\builds\windows\vc2010\freetype.vcxproj"
-#WinrtConverter $in $libFreetype "wp8" >> $null
-
-
-$chipmunkDir = join-path $workingDir "..\..\external\chipmunk" -Resolve
-$libChipmunk = join-path $chipmunkDir "\proj.wp8\chipmunk.vcxproj"
-$in = join-path $chipmunkDir "\proj.win32\chipmunk.vcxproj"
-#WinrtConverter $in $libChipmunk "wp8" >> $null
-
-$chipmunkDir = join-path $workingDir "..\..\external\chipmunk" -Resolve
-$libChipmunk = join-path $chipmunkDir "\proj.winrt\chipmunk.vcxproj"
-$in = join-path $chipmunkDir "\proj.win32\chipmunk.vcxproj"
-#WinrtConverter $in $libChipmunk "winrt" >> $null
-
-
-$testDir = join-path $workingDir "..\..\tests" -Resolve
-$testApp = join-path $testDir "\proj.wp8\TestCpp.vcxproj"
-$in = join-path $testDir "\proj.win32\TestCpp.vcxproj"
-#WinrtConverter $in $testApp "wp8" >> $null
-
-#create opencv sln
-$solutionDir = join-path $workingDir "..\" -Resolve
-$solution = join-path $solutionDir "cocos2d-wp8.vc2012.sln"
-#CreateSolutionFile $solution "wp8" ($c2dLib, $libGUI, $libSpine, $libCocosStudio, $libCocosBuilder, $libExtensions, $libBox2d, $libChipmunk, $libLocalStorage, $libAudio, $testApp)
-
diff --git a/build/winrt/scripts/converterutils.ps1 b/build/winrt/scripts/converterutils.ps1
deleted file mode 100644
index 0f947b03dd..0000000000
--- a/build/winrt/scripts/converterutils.ps1
+++ /dev/null
@@ -1,157 +0,0 @@
-. ".\scripts\createsln.ps1"
-
-#use MSBuild namespace
-$ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
-$ns = @{ ms = $ms }
-
-Function GetDirectoryName($path)
-{
- return [System.IO.Path]::GetFileName($path)
-}
-
-Function GetFileName($path)
-{
- return [System.IO.Path]::GetFileName($path)
-}
-
-Function Get-RelativePath($Folder, $FilePath)
-{
- Write-Verbose "Resolving paths relative to '$Folder'"
- $from = $Folder = split-path $Folder -NoQualifier -Resolve:$Resolve
- $to = $filePath = split-path $filePath -NoQualifier -Resolve:$Resolve
-
- while($from -and $to -and ($from -ne $to)) {
- if($from.Length -gt $to.Length) {
- $from = split-path $from
- } else {
- $to = split-path $to
- }
- }
-
- $filepath = $filepath -replace "^"+[regex]::Escape($to)+"\\"
- $from = $Folder
- while($from -and $to -and $from -gt $to ) {
- $from = split-path $from
- $filepath = join-path ".." $filepath
- }
- return $filepath
-}
-
-
-Function ReplaceText($path, $text, $replace)
-{
- (Get-Content $path) |
- Foreach-Object {$_ -replace $text, $replace} |
- Set-Content $path
-}
-
-
-
-Function LoadXmlFile($path)
-{
- $xml = New-Object -TypeName XML
- $xml.Load($path)
- return $xml
-}
-
-Function AddElement($xml, $root, $name, $value, $namespace)
-{
- $newEl = $xml.CreateElement($name, $namespace)
- $xmlText = $xml.CreateTextNode($value)
- $newEl.AppendChild($xmlText)
- $root.AppendChild($newEl)
- return $newEl
-}
-
-Function GetProjectGlobals($path, $namespace)
-{
- $xml = LoadXmlFile($path)
- $globals = Select-XML -Xml $xml -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $namespace
- return $globals
-}
-
-Function AddProjectReference($toProject, $projects)
-{
- $xml = LoadXmlFile($toProject)
- $xdNS = $xml.DocumentElement.NamespaceURI
-
- foreach($fromProject in $projects)
- {
- $globals = GetProjectGlobals $fromProject $ns
- $itemGroup = $xml.CreateElement("ItemGroup", $xdNS)
- $projectReference = $xml.CreateElement("ProjectReference", $xdNS)
- $project = $xml.CreateElement("Project", $xdNS)
- $xmlText = $xml.CreateTextNode($globals.Node.ProjectGuid)
- $project.AppendChild($xmlText)
- $projectReference.AppendChild($project)
-
- $include = $xml.CreateAttribute("Include")
-
- $dir = Split-Path -parent $toProject
- $include.Value = Get-RelativePath $dir $fromProject
- $projectReference.Attributes.Append($include)
-
-
- $itemGroup.AppendChild($projectReference)
-
- $root = Select-XML -Xml $xml -XPath '//ms:Project[@DefaultTargets="Build"]' -Namespace $ns
- $root.Node.AppendChild($itemGroup)
- }
- $xml.Save($toProject)
-}
-
-Function AddPreprocessorDefine($xml, $define)
-{
- foreach($item in (Select-XML -Xml $xml -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
- {
- if(!($item.Node.ClCompile.PreprocessorDefinitions -match ($define + ';')))
- {
- $item.Node.ClCompile.PreprocessorDefinitions = $define + ";" + $item.Node.ClCompile.PreprocessorDefinitions
- }
- }
-}
-
-<#
-
-
- {c38fab57-9dec-4546-bd9a-6c1dbba6c077}
-
-
-#>
-
-
-
-
-Function RemoveNode($xml, $xpath)
-{
- $item = Select-XML -Xml $xml -XPath $xpath -Namespace $ns
- if($item)
- {
- $item.Node.ParentNode.RemoveChild($item.node)
- }
-}
-
-Function RemoveProjectFile($path, $filename)
-{
- $xml = LoadXmlFile($path)
- $xpath = '//ms:ClCompile [@Include="' + $filename + '"]'
- RemoveNode $xml $xpath
- $xml.Save($path)
- $xml = LoadXmlFile($path + ".filters")
- RemoveNode $xml $xpath
- $xml.Save($path + ".filters")
-}
-
-Function CreateSolutionFile($path, $platform, $projects)
-{
- $solution = CreateSolution
- $solution.solutionDir = Split-Path -parent $path
- foreach($project in $projects)
- {
- $solution.AddProject($project)
- }
- $solution.Save($path, $platform)
-}
-
-
-
diff --git a/build/winrt/scripts/createsln.ps1 b/build/winrt/scripts/createsln.ps1
deleted file mode 100644
index 73de207fbb..0000000000
--- a/build/winrt/scripts/createsln.ps1
+++ /dev/null
@@ -1,98 +0,0 @@
-Function CreateSolution()
-{
- $solution = New-Module -AsCustomObject -ScriptBlock {
- . ".\scripts\converterutils.ps1"
-
- #use MSBuild namespace
- $ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
- $ns = @{ ms = $ms }
-
- $projects = @()
- $solutionDir = ""
-
-
- Function AddProject($path) {
- $globals = GetProjectGlobals $path $ns
- $guid = $globals.Node.ProjectGuid
- $relativePath = Get-RelativePath $this.solutionDir $path
- $project = New-Object –TypeName PSObject
- $project | Add-Member –MemberType NoteProperty –Name guid –Value $globals.Node.ProjectGuid
- $project | Add-Member –MemberType NoteProperty –Name path –Value $relativePath
- if($globals.Node.ProjectName)
- {
- $project | Add-Member –MemberType NoteProperty –Name name –Value $globals.Node.ProjectName
- }
- else
- {
- $project | Add-Member –MemberType NoteProperty –Name name –Value $globals.Node.RootNamespace
- }
-
- $this.projects += $project
- }
-
- Function Save($path, $platform) {
- $output = New-Item $path -type file -force
-
- if($platform -eq "winrt")
- {
- $template = join-path $PSScriptRoot "templates\winrt_sln_header_template.txt"
- }
- elseif($platform -eq "wp8")
- {
- $template = join-path $PSScriptRoot "templates\wp8_sln_header_template.txt"
- }
- else
- {
- throw "Unknown platform argument (winrt or wp8)"
- }
-
- (Get-Content $template) |
- Add-Content $path
-
- foreach($project in $this.projects)
- {
- $line = 'Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "' + $project.name + '", "' + $project.path + '", "' + $project.guid + '"'
- #Add-Content $path 'Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv_core", "opencv_core.vcxproj", "{8F928FE0-8A06-4F93-99FE-53B9C7A006CA}"'
- Add-Content $path $line
- Add-Content $path 'EndProject'
- }
-
- $template = join-path $PSScriptRoot "templates\global_start_template.txt"
- (Get-Content $template) |
- Add-Content $path
-
- $template = join-path $PSScriptRoot "templates\globalsection_template.txt"
- foreach($project in $this.projects)
- {
- (Get-Content $template) |
- Foreach-Object {$_ -replace "REPLACE_GUID", $project.guid} |
- Add-Content $path
- }
-
- $template = join-path $PSScriptRoot "templates\global_end_template.txt"
- (Get-Content $template) |
- Add-Content $path
- }
-
- Export-ModuleMember -Variable * -Function *
- }
- return $solution
-}
-
-<#
-$solutionDir = join-path $WorkingDir ".\modules\core"
-$path = join-path $solutionDir "opencv_core.vcxproj"
-$output = join-path $solutionDir "opencv_core2.sln"
-
-
-$solution = CreateSolution
-$solution.solutionDir = $solutionDir
-$solution.AddProject($path)
-
-$path = join-path $WorkingDir ".\3rdparty\zlib\zlib.vcxproj"
-$solution.AddProject($path)
-
-$solution.Save($output)
-notepad $output
-#>
-
diff --git a/build/winrt/scripts/templates/global_end_template.txt b/build/winrt/scripts/templates/global_end_template.txt
deleted file mode 100644
index 31264602ba..0000000000
--- a/build/winrt/scripts/templates/global_end_template.txt
+++ /dev/null
@@ -1,5 +0,0 @@
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/build/winrt/scripts/templates/global_start_template.txt b/build/winrt/scripts/templates/global_start_template.txt
deleted file mode 100644
index 827f340cd1..0000000000
--- a/build/winrt/scripts/templates/global_start_template.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/globalsection_template.txt b/build/winrt/scripts/templates/globalsection_template.txt
deleted file mode 100644
index 46621e978b..0000000000
--- a/build/winrt/scripts/templates/globalsection_template.txt
+++ /dev/null
@@ -1,12 +0,0 @@
- REPLACE_GUID.Debug|ARM.ActiveCfg = Debug|ARM
- REPLACE_GUID.Debug|ARM.Build.0 = Debug|ARM
- REPLACE_GUID.Debug|Win32.ActiveCfg = Debug|Win32
- REPLACE_GUID.Debug|Win32.Build.0 = Debug|Win32
- REPLACE_GUID.Debug|x64.ActiveCfg = Debug|x64
- REPLACE_GUID.Debug|x64.Build.0 = Debug|x64
- REPLACE_GUID.Release|ARM.ActiveCfg = Release|ARM
- REPLACE_GUID.Release|ARM.Build.0 = Release|ARM
- REPLACE_GUID.Release|Win32.ActiveCfg = Release|Win32
- REPLACE_GUID.Release|Win32.Build.0 = Release|Win32
- REPLACE_GUID.Release|x64.ActiveCfg = Release|x64
- REPLACE_GUID.Release|x64.Build.0 = Release|x64
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/winrt_dll_template.vcxproj b/build/winrt/scripts/templates/winrt_dll_template.vcxproj
deleted file mode 100644
index 10f9704862..0000000000
--- a/build/winrt/scripts/templates/winrt_dll_template.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
- Debug
- ARM
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- ARM
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {9c7946f4-84fe-4b1c-b715-50083798b41c}
- Win32Proj
- Dll1
- Dll1
- en-US
- 12.0
- true
- Windows Store
- 8.1
-
-
-
- DynamicLibrary
- true
- v120
-
-
- DynamicLibrary
- true
- v120
-
-
- DynamicLibrary
- true
- v120
-
-
- DynamicLibrary
- false
- true
- v120
-
-
- DynamicLibrary
- false
- true
- v120
-
-
- DynamicLibrary
- false
- true
- v120
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- false
-
-
- false
- false
-
-
- false
- false
-
-
- false
- false
-
-
- false
- false
-
-
- false
- false
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
-
-
- Console
- false
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/winrt_lib_template.vcxproj b/build/winrt/scripts/templates/winrt_lib_template.vcxproj
deleted file mode 100644
index 171c2e0aee..0000000000
--- a/build/winrt/scripts/templates/winrt_lib_template.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
- Debug
- ARM
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- ARM
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {8597d6ff-2d26-4f86-a7d4-72d102a7a8b6}
- Win32Proj
- WinRTStatic
- WinRTStatic
- 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
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- false
- true
-
-
- Console
- false
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/winrt_sln_header_template.txt b/build/winrt/scripts/templates/winrt_sln_header_template.txt
deleted file mode 100644
index 6fd30ff405..0000000000
--- a/build/winrt/scripts/templates/winrt_sln_header_template.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/wp8_dll_template.vcxproj b/build/winrt/scripts/templates/wp8_dll_template.vcxproj
deleted file mode 100644
index 60dfbb09f2..0000000000
--- a/build/winrt/scripts/templates/wp8_dll_template.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- ARM
-
-
- Release
- Win32
-
-
- Release
- ARM
-
-
-
- {03008f82-0317-416a-88d1-068f2c3158e4}
- PhoneDLL1
- en-US
- 11.0
-
-
-
- DynamicLibrary
- true
- v110_wp80
- false
-
-
- DynamicLibrary
- true
- v110_wp80
- false
-
-
- DynamicLibrary
- false
- true
- v110_wp80
- false
-
-
- DynamicLibrary
- false
- true
- v110_wp80
- false
-
-
-
-
-
-
-
- false
-
-
-
- _USRDLL;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- false
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
- false
- true
-
-
-
-
- _USRDLL;NDEBUG;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- false
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
- false
- true
-
-
-
-
- _USRDLL;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- false
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
- false
- true
-
-
-
-
- _USRDLL;NDEBUG;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- false
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
- false
- true
-
-
-
-
- true
-
-
- true
- false
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/wp8_lib_template.vcxproj b/build/winrt/scripts/templates/wp8_lib_template.vcxproj
deleted file mode 100644
index 13f9986f1c..0000000000
--- a/build/winrt/scripts/templates/wp8_lib_template.vcxproj
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- ARM
-
-
- Release
- Win32
-
-
- Release
- ARM
-
-
-
- {5c48b0d3-dcad-4bfd-a77f-0dac7316f57a}
- PhoneLib1
- 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)
-
-
- Console
- false
-
-
-
-
- _LIB;NDEBUG;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
-
-
-
-
- _LIB;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
-
-
-
-
- _LIB;NDEBUG;%(PreprocessorDefinitions)
- NotUsing
- pch.h
- $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
-
-
- Console
- false
-
-
-
-
- true
-
-
- true
- false
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/winrt/scripts/templates/wp8_sln_header_template.txt b/build/winrt/scripts/templates/wp8_sln_header_template.txt
deleted file mode 100644
index 2e5a6a75af..0000000000
--- a/build/winrt/scripts/templates/wp8_sln_header_template.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
diff --git a/build/winrt/scripts/winrtconverter.ps1 b/build/winrt/scripts/winrtconverter.ps1
deleted file mode 100644
index 8f09d37648..0000000000
--- a/build/winrt/scripts/winrtconverter.ps1
+++ /dev/null
@@ -1,259 +0,0 @@
-. ".\scripts\converterutils.ps1"
-
-#use MSBuild namespace
-$ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
-$ns = @{ ms = $ms }
-
-
-
-
-Function ConvertAdditionalIncludesToRelativePaths($paths, $folder)
-{
- $result = ""
- $tokens = $paths.replace(' ','').split(';')
- foreach($token in $tokens)
- {
- if($token -ne "%(AdditionalIncludeDirectories)")
- {
- $result += (Get-RelativePath $folder $token) + ';'
- }
- else
- {
- $result += "%(AdditionalIncludeDirectories);"
- }
-
- }
- return $result
-}
-
-
-
-
-Function WinrtConverter($inFile, $outFile, $platform)
-{
- $InputDirPath = Split-Path -parent $inFile
- $InputDir = [System.IO.Path]::GetFileNameWithoutExtension($InputDirPath)
- $fileName = [System.IO.Path]::GetFileNameWithoutExtension($inFile)
- $OutDir = Split-Path -parent $outFile
-
- #create output dir
- New-Item -ItemType Directory -Force -Path $OutDir
-
- <#
- Try to load the output file.
- If successful, copy the guid out of the globals section
- #>
-
- $guid =$null
-
- try
- {
- $xml = New-Object -TypeName XML
- $xml.Load($outFile)
- $globals = Select-XML -Xml $xml -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
- $guid = $globals.Node.ProjectGuid
- }
- catch
- {
- $guid = '{' + [guid]::NewGuid().toString().ToUpper() + '}'
- }
-
- # load input file into an XML object:
- $xml_win32 = New-Object -TypeName XML
- $xml_win32.Load($inFile)
-
- $configs = Select-XML -Xml $xml_win32 -XPath '//ms:PropertyGroup[@Label="Configuration"]' -Namespace $ns
-
- $Template = $null
-
- if($platform -eq "winrt")
- {
- if($configs[0].Node.ConfigurationType -eq "DynamicLibrary")
- {
- $Template = join-path $PSScriptRoot "templates\winrt_dll_template.vcxproj"
- }
- elseif($configs[0].Node.ConfigurationType -eq "StaticLibrary")
- {
- $Template = join-path $PSScriptRoot "templates\winrt_lib_template.vcxproj"
- }
- else
- {
- throw "Unknown vcxproj type"
- }
- }
- elseif($platform -eq "wp8")
- {
- if($configs[0].Node.ConfigurationType -eq "DynamicLibrary")
- {
- $Template = join-path $PSScriptRoot "templates\wp8_dll_template.vcxproj"
- }
- elseif($configs[0].Node.ConfigurationType -eq "StaticLibrary")
- {
- $Template = join-path $PSScriptRoot "templates\wp8_lib_template.vcxproj"
- }
- elseif($configs[0].Node.ConfigurationType -eq "Application")
- {
- $Template = join-path $PSScriptRoot "templates\wp8_lib_template.vcxproj"
- }
- else
- {
- throw "Unknown vcxproj type"
- }
- }
- else
- {
- throw "Unknown platform argument -p (winrt or wp8)"
- }
-
- $xml_template = New-Object -TypeName XML
- $xml_template.Load($Template)
-
-
- #Update Project Guid and Name
- $win32_globals = Select-XML -Xml $xml_win32 -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
-
- $winrt_globals = Select-XML -Xml $xml_template -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
- $winrt_globals.Node.ProjectGuid = $guid
-
-
- if($win32_globals.Node.ProjectName)
- {
- $winrt_globals.Node.RootNamespace = $win32_globals.Node.ProjectName
-
- if($winrt_globals.Node.ProjectName)
- {
- $winrt_globals.Node.ProjectName = $win32_globals.Node.ProjectName
- }
- }
-
-
-
- if($win32_globals.Node.RootNamespace)
- {
- $winrt_globals.Node.RootNamespace = $win32_globals.Node.RootNamespace
- }
-
- $project = Select-XML -Xml $xml_template -XPath '//ms:Project' -Namespace $ns
-
-
-
- foreach($item in (Select-XML -Xml $xml_win32 -XPath '//ms:ItemGroup' -Namespace $ns))
- {
- if ($item.node.ClInclude -or $item.node.ClCompile)
- {
- $newNode = $xml_template.ImportNode($item.Node, $true)
- $project.Node.AppendChild($newNode)
- }
- }
-
-
- #Copy ItemDefinitionGroup properties
- $debug_properties = $null
- $release_properties = $null
-
-
- foreach($item in (Select-XML -Xml $xml_win32 -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
- {
- if($item.node.Condition -match "debug")
- {
- $debug_properties = $item
- }
- else
- {
- $release_properties = $item
- }
- }
-
- $debug_includes = $debug_properties.Node.ClCompile.AdditionalIncludeDirectories
- $release_includes = $release_properties.Node.ClCompile.AdditionalIncludeDirectories
-
-
- foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
- {
- $includes = $release_includes;
- $properties = $release_properties
-
- if($item.node.Condition -match "debug")
- {
- $includes = $debug_includes;
- $properties = $debug_properties
- }
-
- AddElement $xml_template $item.Node.ClCompile 'AdditionalIncludeDirectories' $includes $ms
- AddElement $xml_template $item.Node.ClCompile 'PreprocessorDefinitions' $properties.Node.ClCompile.PreprocessorDefinitions $ms
- if($properties.Node.ClCompile.PrecompiledHeader)
- {
- $item.Node.ClCompile.PrecompiledHeader = $properties.Node.ClCompile.PrecompiledHeader
- }
-
- if($properties.Node.ClCompile.PrecompiledHeaderFile)
- {
- AddElement $xml_template $item.Node.ClCompile 'PrecompiledHeaderFile' "precomp.hpp" $ms
- }
-
-
-
- if($properties.Node.ClCompile.ForcedIncludeFiles)
- {
- AddElement $xml_template $item.Node.ClCompile 'ForcedIncludeFiles' "precomp.hpp" $ms
- }
-
-
- if($properties.Node.ClCompile.DisableSpecificWarnings)
- {
- AddElement $xml_template $item.Node.ClCompile 'DisableSpecificWarnings' $properties.Node.ClCompile.DisableSpecificWarnings $ms
- }
- }
-
-
- #save output file
- $xml_template.Save($outFile)
-
-
-
-
- foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:Project//ms:ItemGroup//ms:ClCompile//ms:PrecompiledHeader' -Namespace $ns))
- {
- $newNode = $xml_template.ImportNode($item.Node, $true)
- $newNode.Condition = $newNode.Condition.replace("Win32", "ARM")
- $item.Node.parentNode.AppendChild($newNode)
- $newNode = $xml_template.ImportNode($item.Node, $true)
- $newNode.Condition = $newNode.Condition.replace("Win32", "x64")
- $item.Node.parentNode.AppendChild($newNode)
- }
-
- foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:Project//ms:ItemGroup//ms:ClCompile//ms:PrecompiledHeaderFile' -Namespace $ns))
- {
- $item.Node."#text" = "precomp.hpp"
- $newNode = $xml_template.ImportNode($item.Node, $true)
- $newNode.Condition = $newNode.Condition.replace("Win32", "ARM")
- $item.Node.parentNode.AppendChild($newNode)
- $newNode = $xml_template.ImportNode($item.Node, $true)
- $newNode.Condition = $newNode.Condition.replace("Win32", "x64")
- $item.Node.parentNode.AppendChild($newNode)
- }
-
- $xml_template.selectNodes('//data/value[contains(.,"precomp.hpp")]')|
- ForEach-Object{
- $_.'#text' = 'precomp.hpp'
- }
-
- $xml_template.Save($outFile)
-
-
- #copy .filters file
- try
- {
- $filters = $inFile + ".filters"
- $xml_filters = New-Object -TypeName XML
- $xml_filters.Load($filters)
- $xml_filters.Save($outFile + ".filters")
- }
- catch
- {
- Write-Host "No .filters file"
- }
-}
-
-
-
diff --git a/build/winrt/wp8_precompiled_shaders.txt b/build/winrt/wp8_precompiled_shaders.txt
deleted file mode 100644
index ca3deaf2c0..0000000000
--- a/build/winrt/wp8_precompiled_shaders.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-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/build/wp8/Cocos2dShaderCompiler/App.xaml b/build/wp8/Cocos2dShaderCompiler/App.xaml
deleted file mode 100644
index 59b08aeeb6..0000000000
--- a/build/wp8/Cocos2dShaderCompiler/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/build/wp8/Cocos2dShaderCompiler/App.xaml.cpp b/build/wp8/Cocos2dShaderCompiler/App.xaml.cpp
deleted file mode 100644
index 5fb1b8785f..0000000000
--- a/build/wp8/Cocos2dShaderCompiler/App.xaml.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// App.xaml.cpp
-// Implementation of the App class.
-//
-
-#include "pch.h"
-#include "DirectXPage.xaml.h"
-
-using namespace Cocos2dShaderCompiler;
-
-using namespace Platform;
-using namespace Windows::ApplicationModel;
-using namespace Windows::ApplicationModel::Activation;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::Storage;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-using namespace Windows::UI::Xaml::Data;
-using namespace Windows::UI::Xaml::Input;
-using namespace Windows::UI::Xaml::Interop;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Navigation;
-///
-/// Initializes the singleton application object. This is the first line of authored code
-/// executed, and as such is the logical equivalent of main() or WinMain().
-///
-App::App()
-{
- InitializeComponent();
- Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
- Resuming += ref new EventHandler