diff --git a/AUTHORS b/AUTHORS index 54fbc19a935e..29a29c1fe6b9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -369,6 +369,7 @@ Developers: giginet Fix CCRepeat#create is recieved bad argument on Lua binding. Added a feature that CCSSceneReader can load name properties as node names. + Added Rect::intersectsCircle(). neokim Adds 'setFont' and 'setAnchorPoint' to CCEditBox. @@ -1093,6 +1094,12 @@ Developers: Almax27 RenderQueue command buffer optimize. + + IgorMats + Added MotionStreak::getStroke/setStroke + + matsuokah + Fixed the bug that JNI illegal start byte error causes crashing error on Android 5.0 Retired Core Developers: WenSheng Yang diff --git a/CHANGELOG b/CHANGELOG index 47ecf9dd64ad..f740cb458e1c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,25 @@ +cocos2d-x-3.6 ?? + [NEW] 3rd: update chipmunk to v 6.2.2 on Windows 8.1 Universal App + [NEW] 3rd: update freetype to v 2.5.5 on Windows 8.1 Universal App + [NEW] WP8: remove WP8 support because Angle don't support WP8 any more + + [FIX] JNI: JNI illegal start byte error which causes crashing error on Android 5.0 + cocos2d-x-3.6beta0 Apr.14 2015 + [NEW] 3rd: update Spine runtime to v2.1.25 + [NEW] MotionStreak: add `MotionStreak::getStroke()` and `MotionStreak::setStroke()` + [NEW] Rect: added `Rect::intersectsCircle()` [NEW] UI:Text: add `Text::disableEffect(LabelEffect)` to disable a specific effect + [FIX] 3rd: link error on VS2012 caused by libpng + [FIX] Label: position is wrong if it is visited by a new camera + [FIX] Particle3D: crash on clone + [FIX] Particle3D: "make local" now working correctly. "Make local" is a properties that toggles particle coordination between local and global. + [FIX] Particle3D: particle rotation now no longer stacks up on each other + [FIX] Particle3D: Ribbon Trail now positions correctly [FIX] Physics: rigid body's rotation is wrong if it is attatched to a node which rotation is not 0 [FIX] Renderer: RenderQueue command buffer optimizing + [FIX] UI:Button: use too much memory [FIX] UI:Text: content size is wrong after setting outline effect cocos2d-x-3.6alpha0 Apr.8 2015 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cedb71ca4f5..d437eff6b635 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() project (Cocos2d-X) # The version number -set(COCOS2D_X_VERSION 3.6alpha0) +set(COCOS2D_X_VERSION 3.6beta0) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/") include(CocosBuildHelpers) diff --git a/README.md b/README.md index 86c99154be81..d2fef9b64b32 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 117cf4478432..000000000000 --- a/build/cocos2d-wp8.sln +++ /dev/null @@ -1,271 +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 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js-tests-wp8-xaml", "js-tests-wp8-xaml", "{6AC4C94D-3529-48CC-8B3D-F8E904BA2C95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\cocos\scripting\js-bindings\proj.wp8\libjscocos2d.vcxproj", "{DD11890A-006E-4D4B-BBE6-A577601288A2}" -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 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|ARM.ActiveCfg = Debug|ARM - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|ARM.Build.0 = Debug|ARM - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|Win32.Build.0 = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|x64.ActiveCfg = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|x86.ActiveCfg = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Debug|x86.Build.0 = Debug|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|Any CPU.ActiveCfg = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|ARM.ActiveCfg = Release|ARM - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|ARM.Build.0 = Release|ARM - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|Mixed Platforms.Build.0 = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|Win32.ActiveCfg = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|Win32.Build.0 = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|x64.ActiveCfg = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.Release|x86.ActiveCfg = Release|Win32 - {DD11890A-006E-4D4B-BBE6-A577601288A2}.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 13bbf9f607cd..000000000000 --- 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 0fe0e2c21270..000000000000 --- 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 0f947b03dd46..000000000000 --- 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 73de207fbbc2..000000000000 --- 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 31264602baf4..000000000000 --- 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 827f340cd164..000000000000 --- 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 46621e978bbe..000000000000 --- 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 10f970486247..000000000000 --- 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 171c2e0aee86..000000000000 --- 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 6fd30ff405a3..000000000000 --- 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 60dfbb09f272..000000000000 --- 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 13f9986f1ce3..000000000000 --- 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 2e5a6a75af52..000000000000 --- 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 8f09d376485f..000000000000 --- 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 ca3deaf2c00d..000000000000 --- 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 59b08aeeb621..000000000000 --- 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 5fb1b8785f97..000000000000 --- 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(this, &App::OnResuming); -} - -/// -/// Invoked when the application is launched normally by the end user. Other entry points -/// will be used when the application is launched to open a specific file, to display -/// search results, and so forth. -/// -/// Details about the launch request and process. -void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) -{ -#if _DEBUG - if (IsDebuggerPresent()) - { - DebugSettings->EnableFrameRateCounter = true; - } -#endif - - m_directXPage = ref new DirectXPage(); - - if (e->PreviousExecutionState == ApplicationExecutionState::Terminated) - { - m_directXPage->LoadInternalState(ApplicationData::Current->LocalSettings->Values); - } - - // Place the page in the current window and ensure that it is active. - Window::Current->Content = m_directXPage; - Window::Current->Activate(); -} - -/// -/// Invoked when application execution is being suspended. Application state is saved -/// without knowing whether the application will be terminated or resumed with the contents -/// of memory still intact. -/// -/// The source of the suspend request. -/// Details about the suspend request. -void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) -{ - (void) sender; // Unused parameter - (void) e; // Unused parameter - - m_directXPage->SaveInternalState(ApplicationData::Current->LocalSettings->Values); -} - -/// -/// Invoked when application execution is being resumed. -/// -/// The source of the resume request. -/// Details about the resume request. -void App::OnResuming(Object ^sender, Object ^args) -{ - (void) sender; // Unused parameter - (void) args; // Unused parameter - - m_directXPage->LoadInternalState(ApplicationData::Current->LocalSettings->Values); -} diff --git a/build/wp8/Cocos2dShaderCompiler/App.xaml.h b/build/wp8/Cocos2dShaderCompiler/App.xaml.h deleted file mode 100644 index c446f4704cd1..000000000000 --- a/build/wp8/Cocos2dShaderCompiler/App.xaml.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// App.xaml.h -// Declaration of the App class. -// - -#pragma once - -#include "App.g.h" -#include "DirectXPage.xaml.h" - -namespace Cocos2dShaderCompiler -{ - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - ref class App sealed - { - public: - App(); - virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override; - - private: - void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); - void OnResuming(Platform::Object ^sender, Platform::Object ^args); - DirectXPage^ m_directXPage; - }; -} diff --git a/build/wp8/Cocos2dShaderCompiler/Assets/logo.png b/build/wp8/Cocos2dShaderCompiler/Assets/logo.png deleted file mode 100644 index e26771cb33a4..000000000000 Binary files a/build/wp8/Cocos2dShaderCompiler/Assets/logo.png and /dev/null differ diff --git a/build/wp8/Cocos2dShaderCompiler/Assets/smalllogo.png b/build/wp8/Cocos2dShaderCompiler/Assets/smalllogo.png deleted file mode 100644 index 1eb0d9d528c4..000000000000 Binary files a/build/wp8/Cocos2dShaderCompiler/Assets/smalllogo.png and /dev/null differ diff --git a/build/wp8/Cocos2dShaderCompiler/Assets/splashscreen.png b/build/wp8/Cocos2dShaderCompiler/Assets/splashscreen.png deleted file mode 100644 index d8ded7198a09..000000000000 Binary files a/build/wp8/Cocos2dShaderCompiler/Assets/splashscreen.png and /dev/null differ diff --git a/build/wp8/Cocos2dShaderCompiler/Assets/storelogo.png b/build/wp8/Cocos2dShaderCompiler/Assets/storelogo.png deleted file mode 100644 index dcb672712c68..000000000000 Binary files a/build/wp8/Cocos2dShaderCompiler/Assets/storelogo.png and /dev/null differ diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln deleted file mode 100644 index 9a3f157f73af..000000000000 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln +++ /dev/null @@ -1,92 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.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}") = "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 - ..\..\..\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 - {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 deleted file mode 100644 index 72b7c2279ad8..000000000000 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj +++ /dev/null @@ -1,698 +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 - 2371BAA26A4995D58B8E87430D9BE585C3507553 - - - - 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\freetype;$(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\freetype;$(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\freetype;$(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\freetype;$(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\freetype;$(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\freetype;$(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 deleted file mode 100644 index d845edead119..000000000000 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters +++ /dev/null @@ -1,1353 +0,0 @@ - - - - - 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} - - - {bbb9abc2-fcf3-4341-8a22-20443e57d702} - - - {50bc6348-a253-45c5-a2f2-160932464451} - - - {1db52ff3-68ce-4833-9dcc-2b9397b439e3} - - - {62560478-8dbb-41e1-be0b-fdfed8d1b0c5} - - - - - - - - - - - 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\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\2d - - - libcoco2d\2d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base - - - libcoco2d\ui\shaders - - - - - - - - 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\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\2d - - - libcoco2d\2d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\3d - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base\allocator - - - libcoco2d\base - - - libcoco2d\ui\shaders - - - - - - - - - - - libcoco2d\math - - - libcoco2d\3d - - - - - - \ No newline at end of file diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx deleted file mode 100644 index 7c35719379f9..000000000000 Binary files a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx and /dev/null differ diff --git a/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml b/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml deleted file mode 100644 index e8d59e66b0d1..000000000000 --- a/build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - -