diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj index 2b44d72452..c6238489c7 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj @@ -18,13 +18,17 @@ StaticLibrary true - v110_xp + v100 + v110 + v110_xp Unicode StaticLibrary false - v110_xp + v100 + v110 + v110_xp true Unicode diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index d52ce8d931..77de7fdb61 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -106,13 +106,17 @@ StaticLibrary true - v110_xp + v100 + v110 + v110_xp Unicode StaticLibrary false - v110_xp + v100 + v110 + v110_xp true Unicode diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index b4fc436abf..b8bd4306b8 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -65,13 +65,17 @@ StaticLibrary true - v110_xp + v100 + v110 + v110_xp Unicode StaticLibrary false - v110_xp + v100 + v110 + v110_xp true Unicode diff --git a/cocos/gui/proj.win32/libGUI.vcxproj b/cocos/gui/proj.win32/libGUI.vcxproj index 1e483d4b85..b225eaa127 100644 --- a/cocos/gui/proj.win32/libGUI.vcxproj +++ b/cocos/gui/proj.win32/libGUI.vcxproj @@ -67,13 +67,17 @@ StaticLibrary true - v110_xp + v100 + v110 + v110_xp Unicode StaticLibrary false - v110_xp + v100 + v110 + v110_xp true Unicode diff --git a/cocos/scripting/javascript/script/jsb_cocos2d.js b/cocos/scripting/javascript/script/jsb_cocos2d.js index 684eb386d9..5689a7a51e 100644 --- a/cocos/scripting/javascript/script/jsb_cocos2d.js +++ b/cocos/scripting/javascript/script/jsb_cocos2d.js @@ -230,12 +230,30 @@ cc.sizeEqualToSize = function (size1, size2) return ((size1.width == size2.width) && (size1.height == size2.height)); }; -// -// Rect -// +/** + * create a cc.rect object + * @param {Number|cc.point|cc.rect} [x] a Number value as x or a cc.point object as origin or a cc.rect clone object + * @param {Number|cc.size} [y] x1 a Number value as y or a cc.size object as size + * @param {Number} [w] + * @param {Number} [h] + * @return {Object} a cc.rect object + */ cc.rect = function(x,y,w,h) { - return {x:x, y:y, width:w, height:h}; + var argLen = arguments.length; + if (argLen === 0) + return { x: 0, y: 0, width: 0, height: 0 }; + + if (argLen === 1) + return { x: x.x, y: x.y, width: x.width, height: x.height }; + + if (argLen === 2) + return { x: x.x, y: x.y, width: y.width, height: y.height }; + + if (argLen === 4) + return { x: x, y: y, width: w, height: h }; + + throw "unknown argument type"; }; cc._rect = function(x,y,w,h) { diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj index d79eb7ce1c..3413ec57b0 100644 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj +++ b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj @@ -24,13 +24,17 @@ StaticLibrary true - v110_xp + v100 + v110 + v110_xp Unicode StaticLibrary false - v110_xp + v100 + v110 + v110_xp true Unicode