From b66b4c6f1d054f1418ae64aae4891df7bbb4cfde Mon Sep 17 00:00:00 2001 From: Mircea Rila Date: Wed, 7 May 2014 17:41:04 +0300 Subject: [PATCH 1/3] upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). remove C4005 warnings after upgrading projects --- cocos/2d/cocos2d.vcxproj | 4 ++++ cocos/audio/proj.win32/CocosDenshion.vcxproj | 4 ++++ .../cocosbuilder/proj.win32/libCocosBuilder.vcxproj | 4 ++++ .../cocostudio/proj.win32/libCocosStudio.vcxproj | 4 ++++ cocos/editor-support/spine/proj.win32/libSpine.vcxproj | 4 ++++ cocos/network/proj.win32/libNetwork.vcxproj | 4 ++++ cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj | 4 ++++ .../storage/local-storage/proj.win32/libLocalStorage.vcxproj | 4 ++++ cocos/ui/proj.win32/libGUI.vcxproj | 4 ++++ extensions/proj.win32/libExtensions.vcxproj | 4 ++++ tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj | 4 ++++ tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 4 ++++ .../lua-empty-test/project/proj.win32/lua-empty-test.vcxproj | 4 ++++ tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj | 4 ++++ 14 files changed, 56 insertions(+) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index c5aa08ed5a..b99a812b61 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj b/cocos/audio/proj.win32/CocosDenshion.vcxproj index ecde64b8c3..27bbe7021d 100644 --- a/cocos/audio/proj.win32/CocosDenshion.vcxproj +++ b/cocos/audio/proj.win32/CocosDenshion.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj index f9bebc27e3..1ab8540b96 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj @@ -21,6 +21,8 @@ v100 v110 v110_xp + v120 + v120_xp Unicode @@ -29,6 +31,8 @@ v100 v110 v110_xp + v120 + v120_xp true Unicode diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index c8ecbfb141..f87a9f3f36 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -135,6 +135,8 @@ v100 v110 v110_xp + v120 + v120_xp Unicode @@ -143,6 +145,8 @@ v100 v110 v110_xp + v120 + v120_xp true Unicode diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index 5391b02a6c..1908cd64a2 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -76,6 +76,8 @@ v100 v110 v110_xp + v120 + v120_xp Unicode @@ -84,6 +86,8 @@ v100 v110 v110_xp + v120 + v120_xp true Unicode diff --git a/cocos/network/proj.win32/libNetwork.vcxproj b/cocos/network/proj.win32/libNetwork.vcxproj index 761ab39423..81d55f49d3 100644 --- a/cocos/network/proj.win32/libNetwork.vcxproj +++ b/cocos/network/proj.win32/libNetwork.vcxproj @@ -35,6 +35,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -42,6 +44,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj index 929c92a21f..194e986d50 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj @@ -140,6 +140,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -147,6 +149,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj index 3413ec57b0..16c4f896fd 100644 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj +++ b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj @@ -27,6 +27,8 @@ v100 v110 v110_xp + v120 + v120_xp Unicode @@ -35,6 +37,8 @@ v100 v110 v110_xp + v120 + v120_xp true Unicode diff --git a/cocos/ui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libGUI.vcxproj index e977a36ead..c9d3113857 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj +++ b/cocos/ui/proj.win32/libGUI.vcxproj @@ -72,6 +72,8 @@ v100 v110 v110_xp + v120 + v120_xp Unicode @@ -80,6 +82,8 @@ v100 v110 v110_xp + v120 + v120_xp true Unicode diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 809221d8da..656e7c176f 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -22,6 +22,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -29,6 +31,8 @@ v100 v110 v110_xp + v120 + v120_xp 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 e38b7d723d..0bd4855f12 100644 --- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp Application @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index 2a619e4dcd..b89d8dcb04 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp Application @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp 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 54542c8dd0..c54bd5bfc6 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 @@ -21,6 +21,8 @@ v100 v110 v110_xp + v120 + v120_xp Application @@ -28,6 +30,8 @@ v100 v110 v110_xp + v120 + v120_xp 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 a11954b988..7d5ab0cb3a 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -22,6 +22,8 @@ v100 v110 v110_xp + v120 + v120_xp Application @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp From fb0094e0b7489e250c14c9afc510829447a6d8d5 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 8 May 2014 07:30:48 +0000 Subject: [PATCH 2/3] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 99a83260b9..9e31f1e48a 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -3568,10 +3568,12 @@ "cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua", "cocos/scripting/lua-bindings/auto/api/EventCustom.lua", "cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua", + "cocos/scripting/lua-bindings/auto/api/EventFocus.lua", "cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua", "cocos/scripting/lua-bindings/auto/api/EventListener.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua", + "cocos/scripting/lua-bindings/auto/api/EventListenerFocus.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua", From b22fe211de9454031e65dcbfc0f4e4c2758ff2de Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 8 May 2014 15:42:05 +0800 Subject: [PATCH 3/3] [ci skip] --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index bdae99db8f..66c98dc76f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ cocos2d-x-3.1-alpha1 May.8 2014 [NEW] UI: add navigation support + [NEW] VS: support VS 2013 [FIX] Label: label is unsharp if it's created by system font with small size on iOS & Mac OS X [FIX] Label: Label created with system font is still visible when its opacity is 0