diff --git a/README.md b/README.md
index 672ca3f4af..de6121afb0 100644
--- a/README.md
+++ b/README.md
@@ -135,10 +135,10 @@ Build Requirements
* Mac OS X 10.7+, Xcode 5.1+
* or Ubuntu 12.10+, CMake 2.6+
-* or Windows 7+, VS 2012+
+* or Windows 7+, VS 2013+
* Python 2.7.5
* NDK r10c+ is required to build Android games
-* Windows Phone/Store 8.0 VS 2012+
+* Windows Phone/Store 8.0 VS 2013+
* Windows Phone/Store 8.1 VS 2013 Update 3+
@@ -186,7 +186,7 @@ $ bin/lua-empty-test/lua-empty-test
* For Windows
-Open the `cocos2d-x/build/cocos2d-win32.vc2012.sln`
+Open the `cocos2d-x/build/cocos2d-win32.vc2013.sln`
* For Windows 8.1 Universal Apps (Phone and Store)
diff --git a/build/cocos2d-js-win32.vc2012.sln b/build/cocos2d-js-win32.vc2013.sln
similarity index 99%
rename from build/cocos2d-js-win32.vc2012.sln
rename to build/cocos2d-js-win32.vc2013.sln
index 6a83fb188a..4d7b7c6ec8 100644
--- a/build/cocos2d-js-win32.vc2012.sln
+++ b/build/cocos2d-js-win32.vc2013.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{92D54E36-7916-48EF-A951-224DD3B25442}"
diff --git a/build/cocos2d-js-win8.1-universal.sln b/build/cocos2d-js-win8.1-universal.sln
index 60f8817bf9..c7e811fd33 100644
--- a/build/cocos2d-js-win8.1-universal.sln
+++ b/build/cocos2d-js-win8.1-universal.sln
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}"
@@ -11,14 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Windows", ".
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.WindowsPhone", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.WindowsPhone\libcocos2d_8_1.WindowsPhone.vcxproj", "{22F3B9DF-1209-4574-8331-003966F562BF}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-tests", "cpp-tests", "{572742C5-9322-4548-AB8B-96C3750A1B5D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.Shared", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems", "{BE3A1791-5BCE-4CEA-92CD-0E2D86DDE27A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.Windows", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Windows\cpp-tests.Windows.vcxproj", "{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.WindowsPhone", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.WindowsPhone\cpp-tests.WindowsPhone.vcxproj", "{15247C71-5289-4913-B88F-E253CC353720}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{85630454-74EA-4B5B-9B62-0E459B4476CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libbox2d", "libbox2d", "{B3D1A3D5-9F54-43AF-9322-230B53242B78}"
@@ -37,14 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Windows", "..\coco
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.WindowsPhone", "..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.WindowsPhone\libSpine.WindowsPhone.vcxproj", "{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-empty-test", "cpp-empty-test", "{B70EF25E-E352-4020-BCDF-388973E44637}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Shared", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Windows", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Windows\HelloCpp.Windows.vcxproj", "{79A8FCDA-4B12-4DD1-B676-FF148D651638}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.WindowsPhone", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.WindowsPhone\HelloCpp.WindowsPhone.vcxproj", "{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js-tests", "js-tests", "{8E24A044-D83D-476D-886D-F40E3CC621DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.Shared", "..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems", "{AE6763F6-1549-441E-AFB5-377BE1C776DC}"
@@ -66,14 +50,10 @@ Global
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{ae6763f6-1549-441e-afb5-377be1c776dc}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{94874b5b-398f-448a-a366-35a35dc1db9c}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
- ..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{15247c71-5289-4913-b88f-e253cc353720}*SharedItemsImports = 4
- ..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{70914fc8-7709-4cd6-b86b-c63fde5478db}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
- ..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
- ..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{be3a1791-5bce-4cea-92cd-0e2d86dde27a}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{ca082ec4-17ce-430b-8207-d1e947a5d1e9}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bea66276-51dd-4c53-92a8-f3d1fea50892}*SharedItemsImports = 9
@@ -82,8 +62,6 @@ Global
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
- ..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{f2bae06b-caae-43ee-b21b-57fa48db04fa}*SharedItemsImports = 4
- ..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{396fe85e-bb05-4b92-bccb-f89aed4ea41a}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
@@ -116,38 +94,6 @@ Global
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.ActiveCfg = Release|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.Build.0 = Release|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|x64.ActiveCfg = Release|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.ActiveCfg = Debug|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.Build.0 = Debug|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.Deploy.0 = Debug|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.ActiveCfg = Debug|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.Build.0 = Debug|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.Deploy.0 = Debug|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.ActiveCfg = Debug|x64
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.Build.0 = Debug|x64
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.Deploy.0 = Debug|x64
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.ActiveCfg = Release|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.Build.0 = Release|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.Deploy.0 = Release|ARM
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.ActiveCfg = Release|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.Build.0 = Release|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.Deploy.0 = Release|Win32
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.ActiveCfg = Release|x64
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.Build.0 = Release|x64
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.Deploy.0 = Release|x64
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.ActiveCfg = Debug|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.Build.0 = Debug|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.Deploy.0 = Debug|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.ActiveCfg = Debug|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.Build.0 = Debug|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.Deploy.0 = Debug|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Debug|x64.ActiveCfg = Debug|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.ActiveCfg = Release|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.Build.0 = Release|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.Deploy.0 = Release|ARM
- {15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.ActiveCfg = Release|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.Build.0 = Release|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.Deploy.0 = Release|Win32
- {15247C71-5289-4913-B88F-E253CC353720}.Release|x64.ActiveCfg = Release|Win32
{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
@@ -192,38 +138,6 @@ Global
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|Win32.ActiveCfg = Release|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|Win32.Build.0 = Release|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|x64.ActiveCfg = Release|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.ActiveCfg = Debug|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.Build.0 = Debug|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.Deploy.0 = Debug|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.ActiveCfg = Debug|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.Build.0 = Debug|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.Deploy.0 = Debug|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.ActiveCfg = Debug|x64
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.Build.0 = Debug|x64
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.Deploy.0 = Debug|x64
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.ActiveCfg = Release|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.Build.0 = Release|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.Deploy.0 = Release|ARM
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.ActiveCfg = Release|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.Build.0 = Release|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.Deploy.0 = Release|Win32
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.ActiveCfg = Release|x64
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.Build.0 = Release|x64
- {79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.Deploy.0 = Release|x64
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.ActiveCfg = Debug|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.Build.0 = Debug|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.Deploy.0 = Debug|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.ActiveCfg = Debug|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.Build.0 = Debug|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.Deploy.0 = Debug|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|x64.ActiveCfg = Debug|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.ActiveCfg = Release|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.Build.0 = Release|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.Deploy.0 = Release|ARM
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.ActiveCfg = Release|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Build.0 = Release|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Deploy.0 = Release|Win32
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|x64.ActiveCfg = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.ActiveCfg = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Build.0 = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -286,9 +200,6 @@ Global
{5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
{9335005F-678E-4E8E-9B84-50037216AEC8} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
{22F3B9DF-1209-4574-8331-003966F562BF} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
- {BE3A1791-5BCE-4CEA-92CD-0E2D86DDE27A} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
- {F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
- {15247C71-5289-4913-B88F-E253CC353720} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
{B3D1A3D5-9F54-43AF-9322-230B53242B78} = {85630454-74EA-4B5B-9B62-0E459B4476CB}
{4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {B3D1A3D5-9F54-43AF-9322-230B53242B78}
{3B26A12D-3A44-47EA-82D2-282660FC844D} = {B3D1A3D5-9F54-43AF-9322-230B53242B78}
@@ -297,9 +208,6 @@ Global
{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
{F3550FE0-C795-44F6-8FEB-093EB68143AE} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
- {A3AD93E4-0B2F-4C58-9181-69BED2E42E3E} = {B70EF25E-E352-4020-BCDF-388973E44637}
- {79A8FCDA-4B12-4DD1-B676-FF148D651638} = {B70EF25E-E352-4020-BCDF-388973E44637}
- {396FE85E-BB05-4B92-BCCB-F89AED4EA41A} = {B70EF25E-E352-4020-BCDF-388973E44637}
{AE6763F6-1549-441E-AFB5-377BE1C776DC} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
{70914FC8-7709-4CD6-B86B-C63FDE5478DB} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
{94874B5B-398F-448A-A366-35A35DC1DB9C} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2013.sln
similarity index 99%
rename from build/cocos2d-win32.vc2012.sln
rename to build/cocos2d-win32.vc2013.sln
index 2b6824c9ef..7df927b80c 100644
--- a/build/cocos2d-win32.vc2012.sln
+++ b/build/cocos2d-win32.vc2013.sln
@@ -2,7 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
diff --git a/build/cocos2d-win8.1-universal.sln b/build/cocos2d-win8.1-universal.sln
index 697e7a7721..4ef61407d8 100644
--- a/build/cocos2d-win8.1-universal.sln
+++ b/build/cocos2d-win8.1-universal.sln
@@ -2,7 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}"
diff --git a/build/win32-msvc-2012-x86.cmd b/build/win32-msvc-2012-x86.cmd
deleted file mode 100644
index 7331e5b6b4..0000000000
--- a/build/win32-msvc-2012-x86.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-SETLOCAL
-
-:start
-mkdir win32-msvc-vs2012-x86
-cd win32-msvc-vs2012-x86
-cmake -G "Visual Studio 11" ../..
-pause
diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj
index b3a8273345..38f343de77 100644
--- a/cocos/2d/libcocos2d.vcxproj
+++ b/cocos/2d/libcocos2d.vcxproj
@@ -20,18 +20,12 @@
DynamicLibrary
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
DynamicLibrary
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -50,7 +44,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\
$(Configuration).win32\
false
diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln
index 643e0e020e..ec7fcf7494 100644
--- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln
+++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln
@@ -2,7 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d_8_1", "libcocos2d_8_1", "{CA9DBD4B-603D-494E-802A-1C36E3EA3F07}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}"
diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj
index fe1ae21064..8e7a8941c0 100644
--- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj
+++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj
@@ -83,9 +83,6 @@
StaticLibrary
true
- v100
- v110
- v110_xp
v120
v120_xp
Unicode
@@ -93,9 +90,6 @@
StaticLibrary
false
- v100
- v110
- v110_xp
v120
v120_xp
true
diff --git a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
index d1b868739e..85efe5adb5 100644
--- a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
+++ b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
@@ -102,9 +102,6 @@
StaticLibrary
true
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -112,9 +109,6 @@
StaticLibrary
false
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
index 84877003c9..0c10a4b013 100644
--- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
+++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
@@ -222,18 +222,12 @@
StaticLibrary
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
StaticLibrary
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -250,7 +244,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\
$(Configuration).win32\$(ProjectName)\
$(SolutionDir)$(Configuration).win32\
diff --git a/cocos/ui/proj.win32/libui.vcxproj b/cocos/ui/proj.win32/libui.vcxproj
index 619b8508d4..d2e2674f9a 100644
--- a/cocos/ui/proj.win32/libui.vcxproj
+++ b/cocos/ui/proj.win32/libui.vcxproj
@@ -92,9 +92,6 @@
DynamicLibrary
true
- v100
- v110
- v110_xp
v120
v120_xp
Unicode
@@ -102,9 +99,6 @@
DynamicLibrary
false
- v100
- v110
- v110_xp
v120
v120_xp
true
diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
index 70a0e2e0f0..dd38bb5290 100644
--- a/docs/RELEASE_NOTES.md
+++ b/docs/RELEASE_NOTES.md
@@ -47,8 +47,8 @@
* Xcode 5.1 or newer for iOS or Mac
* gcc 4.9 or newer for Linux
* ndk-r10c for Android
-* Visual Studio 2012 or newer for Windows (win32)
-* Visual Studio 2012 or newer for Windows Phone 8
+* Visual Studio 2013 or newer for Windows (win32)
+* Visual Studio 2013 or newer for Windows Phone 8
## How to run tests
diff --git a/external/config.json b/external/config.json
index 971ac68d0d..05cb6e5415 100644
--- a/external/config.json
+++ b/external/config.json
@@ -1,5 +1,5 @@
{
- "version":"v3-deps-49",
+ "version":"v3-deps-50",
"zip_file_size":"116842586",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",
diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json
index bc37aa3934..782d43f179 100644
--- a/templates/cocos2dx_files.json
+++ b/templates/cocos2dx_files.json
@@ -6,15 +6,14 @@
"README.cmake",
"README.md",
"build/android-build.py",
- "build/cocos2d-js-win32.vc2012.sln",
+ "build/cocos2d-js-win32.vc2013.sln",
"build/cocos2d-js-win8.1-universal.sln",
- "build/cocos2d-win32.vc2012.sln",
+ "build/cocos2d-win32.vc2013.sln",
"build/cocos2d-win8.1-universal.sln",
"build/cocos2d_js_tests.xcodeproj/project.pbxproj",
"build/cocos2d_libs.xcodeproj/project.pbxproj",
"build/cocos2d_tests.xcodeproj/project.pbxproj",
"build/install-deps-linux.sh",
- "build/win32-msvc-2012-x86.cmd",
"build/win32-msvc-2013-x86.cmd",
"cmake/BuildHelpers.CMakeLists.txt",
"cmake/Modules/CMakeParseArguments.cmake",
diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.sln b/templates/cpp-template-default/proj.win32/HelloCpp.sln
index 211cf94446..3fb42a50d8 100644
--- a/templates/cpp-template-default/proj.win32/HelloCpp.sln
+++ b/templates/cpp-template-default/proj.win32/HelloCpp.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "HelloCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
ProjectSection(ProjectDependencies) = postProject
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj
index cc57de42e3..59d8ad8c30 100644
--- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj
+++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj
@@ -20,18 +20,12 @@
Application
Unicode
true
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -50,7 +44,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\
$(Configuration).win32\
true
diff --git a/templates/cpp-template-default/proj.win8.1-universal/HelloCpp.sln b/templates/cpp-template-default/proj.win8.1-universal/HelloCpp.sln
index 53c9e04314..be071c12a8 100644
--- a/templates/cpp-template-default/proj.win8.1-universal/HelloCpp.sln
+++ b/templates/cpp-template-default/proj.win8.1-universal/HelloCpp.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloCpp", "HelloCpp", "{36AFDE04-D127-4D84-9730-D84E3E51EAA7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App.Shared", "App.Shared\HelloCpp.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln
index 03074bfac7..4f2b83420b 100644
--- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln
+++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}"
ProjectSection(ProjectDependencies) = postProject
{39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD}
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj
index 79b3dd84d9..22ad8a18c0 100644
--- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj
+++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj
@@ -18,18 +18,12 @@
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -48,7 +42,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\
$(Configuration).win32\
false
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln
index fb1b307993..3658166bb4 100644
--- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln
+++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloJavascript", "HelloJavascript", "{36AFDE04-D127-4D84-9730-D84E3E51EAA7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript.Shared", "App.Shared\HelloJavascript.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
index 07902498c9..d7ef682815 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.21005.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
ProjectSection(ProjectDependencies) = postProject
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
index 8b4eaaa1d1..c27fd7f6c1 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
@@ -19,18 +19,14 @@
Application
true
Unicode
- v110
v120
- v110_xp
v120_xp
Application
false
Unicode
- v110
v120
- v110_xp
v120_xp
diff --git a/tests/cpp-empty-test/.cocos-project.json b/tests/cpp-empty-test/.cocos-project.json
index 083f76ad90..97103e9e8f 100644
--- a/tests/cpp-empty-test/.cocos-project.json
+++ b/tests/cpp-empty-test/.cocos-project.json
@@ -1,7 +1,7 @@
{
"win32_cfg": {
"project_path": "../../build",
- "sln_file": "cocos2d-win32.vc2012.sln",
+ "sln_file": "cocos2d-win32.vc2013.sln",
"project_name": "cpp-empty-test",
"build_cfg_path": "proj.win32"
},
diff --git a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj
index 6d6907763d..d2bfe579f3 100644
--- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj
+++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj
@@ -20,18 +20,12 @@
Application
Unicode
true
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -49,7 +43,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\cpp-empty-test\
$(Configuration).win32\
true
diff --git a/tests/cpp-tests/.cocos-project.json b/tests/cpp-tests/.cocos-project.json
index 173028a970..34e7c97a15 100644
--- a/tests/cpp-tests/.cocos-project.json
+++ b/tests/cpp-tests/.cocos-project.json
@@ -1,7 +1,7 @@
{
"win32_cfg": {
"project_path": "../../build",
- "sln_file": "cocos2d-win32.vc2012.sln",
+ "sln_file": "cocos2d-win32.vc2013.sln",
"project_name": "cpp-tests",
"build_cfg_path": "proj.win32"
},
diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
index 916f27da6b..af7789c411 100644
--- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
+++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
@@ -20,18 +20,12 @@
Application
Unicode
true
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -50,7 +44,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\cpp-tests\
$(Configuration).win32\
true
diff --git a/tests/js-tests/.cocos-project.json b/tests/js-tests/.cocos-project.json
index 160336f500..bd34889d3f 100644
--- a/tests/js-tests/.cocos-project.json
+++ b/tests/js-tests/.cocos-project.json
@@ -3,7 +3,7 @@
"has_native": true,
"win32_cfg": {
"project_path": "../../build",
- "sln_file": "cocos2d-js-win32.vc2012.sln",
+ "sln_file": "cocos2d-js-win32.vc2013.sln",
"project_name": "js-tests",
"build_cfg_path": "project/proj.win32"
},
diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj
index 37e81a937a..be43805d5f 100644
--- a/tests/js-tests/project/proj.win32/js-tests.vcxproj
+++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj
@@ -18,18 +18,12 @@
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -48,7 +42,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\js-tests\
$(Configuration).win32\
false
diff --git a/tests/lua-empty-test/.cocos-project.json b/tests/lua-empty-test/.cocos-project.json
index 4b78642cd0..470ad30447 100644
--- a/tests/lua-empty-test/.cocos-project.json
+++ b/tests/lua-empty-test/.cocos-project.json
@@ -1,7 +1,7 @@
{
"win32_cfg": {
"project_path": "../../build",
- "sln_file": "cocos2d-win32.vc2012.sln",
+ "sln_file": "cocos2d-win32.vc2013.sln",
"project_name": "lua-empty-test",
"build_cfg_path": "project/proj.win32"
},
diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
index 5c39dc9739..b59e642b9b 100644
--- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
+++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
@@ -18,18 +18,12 @@
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
Application
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -48,7 +42,7 @@
- <_ProjectFileVersion>10.0.40219.1
+ <_ProjectFileVersion>12.0.21005.1
$(SolutionDir)$(Configuration).win32\lua-empty-test\
$(Configuration).win32\
true
diff --git a/tests/lua-tests/.cocos-project.json b/tests/lua-tests/.cocos-project.json
index ee001808a8..aaef81cc15 100644
--- a/tests/lua-tests/.cocos-project.json
+++ b/tests/lua-tests/.cocos-project.json
@@ -1,7 +1,7 @@
{
"win32_cfg": {
"project_path": "../../build",
- "sln_file": "cocos2d-win32.vc2012.sln",
+ "sln_file": "cocos2d-win32.vc2013.sln",
"project_name": "lua-tests",
"build_cfg_path": "project/proj.win32"
},
diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
index 0cc4844115..1f682aea45 100644
--- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
+++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
@@ -19,9 +19,6 @@
Application
true
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
@@ -29,9 +26,6 @@
Application
false
Unicode
- v100
- v110
- v110_xp
v120
v120_xp
diff --git a/tools/gen-prebuilt/build_config.json b/tools/gen-prebuilt/build_config.json
index 0c250ef587..fd0730e1cd 100644
--- a/tools/gen-prebuilt/build_config.json
+++ b/tools/gen-prebuilt/build_config.json
@@ -10,7 +10,7 @@
}
},
"win32_proj_info" : {
- "build/cocos2d-win32.vc2012.sln" : {
+ "build/cocos2d-win32.vc2013.sln" : {
"outputdir" : "prebuilt/win32",
"targets" : [
"libcocosdenshion", "libbox2d", "libchipmunk",
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py b/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py
index 1e55080898..87f8674032 100644
--- a/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py
+++ b/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py
@@ -5,8 +5,8 @@ print 'Build Config:'
print ' Host:win7 x86'
print ' Branch:develop'
print ' Target:win32'
-print ' "%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"'
-if(os.path.exists('build/cocos2d-win32.vc2012.sln') == False):
+print ' "%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2013.sln" /Build "Debug|Win32"'
+if(os.path.exists('build/cocos2d-win32.vc2013.sln') == False):
node_name = os.environ['NODE_NAME']
source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name
source_dir = source_dir.replace("/", os.sep)
@@ -14,7 +14,7 @@ if(os.path.exists('build/cocos2d-win32.vc2012.sln') == False):
os.system('git pull origin develop')
os.system('git submodule update --init --force')
-ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True)
+ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2013.sln" /Build "Debug|Win32"', shell=True)
os.system('git clean -xdf -f')
print 'build exit'
print ret
diff --git a/tools/jenkins-scripts/daily-build.py b/tools/jenkins-scripts/daily-build.py
index 6f6cd81bb4..1927826709 100644
--- a/tools/jenkins-scripts/daily-build.py
+++ b/tools/jenkins-scripts/daily-build.py
@@ -70,15 +70,9 @@ def do_build_slaves():
# patch_cpp_empty_test()
slave_build_scripts = jenkins_script_path + "android-build.sh"
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
- if branch == 'v3':
- slave_build_scripts = jenkins_script_path + "win32-vs2012-build.bat"
- else:
- slave_build_scripts = jenkins_script_path + "win32-vs2013-build.bat"
+ slave_build_scripts = jenkins_script_path + "win32-vs2013-build.bat"
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
- if branch == 'v3':
- slave_build_scripts = jenkins_script_path + "windows-universal-v3.bat"
- else:
- slave_build_scripts = jenkins_script_path + "windows-universal.bat"
+ slave_build_scripts = jenkins_script_path + "windows-universal.bat"
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
slave_build_scripts = jenkins_script_path + "ios-build.sh"
elif(node_name == 'mac' or node_name == 'mac_bak'):
diff --git a/tools/jenkins-scripts/do-pull-request-builder.py b/tools/jenkins-scripts/do-pull-request-builder.py
index c917144f60..6111e24bff 100755
--- a/tools/jenkins-scripts/do-pull-request-builder.py
+++ b/tools/jenkins-scripts/do-pull-request-builder.py
@@ -164,15 +164,9 @@ def do_build_slaves():
# patch_cpp_empty_test()
slave_build_scripts = jenkins_script_path + "android-build.sh"
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
- if branch != 'v4':
- slave_build_scripts = jenkins_script_path + "win32-vs2012-build.bat"
- else:
- slave_build_scripts = jenkins_script_path + "win32-vs2013-build.bat"
+ slave_build_scripts = jenkins_script_path + "win32-vs2013-build.bat"
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
- if branch != 'v4':
- slave_build_scripts = jenkins_script_path + "windows-universal-v3.bat"
- else:
- slave_build_scripts = jenkins_script_path + "windows-universal.bat"
+ slave_build_scripts = jenkins_script_path + "windows-universal.bat"
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
slave_build_scripts = jenkins_script_path + "ios-build.sh"
elif(node_name == 'mac' or node_name == 'mac_bak'):
diff --git a/tools/jenkins-scripts/slave-scripts/win32-vs2012-build.bat b/tools/jenkins-scripts/slave-scripts/win32-vs2012-build.bat
deleted file mode 100755
index 339d000880..0000000000
--- a/tools/jenkins-scripts/slave-scripts/win32-vs2012-build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-win32.vc2012.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/windows-universal-v3.bat b/tools/jenkins-scripts/slave-scripts/windows-universal-v3.bat
deleted file mode 100755
index 7959cc3aed..0000000000
--- a/tools/jenkins-scripts/slave-scripts/windows-universal-v3.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-win8.1-universal.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
index 5787237b71..e44617b9ce 100644
--- a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
+++ b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
@@ -19,18 +19,14 @@
StaticLibrary
true
- v110
v120
- v110_xp
v120_xp
Unicode
StaticLibrary
false
- v110
v120
- v110_xp
v120_xp
true
Unicode