Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17113 from CocosRobot/update_lua_bindings_1483580435 

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
This commit is contained in:
子龙山人 2017-01-05 14:45:31 +08:00 committed by GitHub
parent 2dc382bdf0 69217f0e8b
commit e50d967a26
5 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
View File

@ -12499,7 +12499,7 @@ isWrapEnabled : function (
/**
* @method getOutlineSize
* @return {int}
* @return {float}
*/
getOutlineSize : function (
)

4
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

@ -34159,9 +34159,9 @@ bool js_cocos2dx_Label_getOutlineSize(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getOutlineSize : Invalid Native Object");
if (argc == 0) {
int ret = cobj->getOutlineSize();
double ret = cobj->getOutlineSize();
JS::RootedValue jsret(cx);
jsret = int32_to_jsval(cx, ret);
jsret = DOUBLE_TO_JSVAL(ret);
args.rval().set(jsret);
return true;
}

2
cocos/scripting/lua-bindings/auto/api/Label.lua
View File

@ -161,7 +161,7 @@
-- Return the outline effect size value.
-- @function [parent=#Label] getOutlineSize
-- @param self
-- @return int#int ret (return value: int)
-- @return float#float ret (return value: float)
--------------------------------
-- Sets a new bitmap font to Label

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -54212,7 +54212,7 @@ int lua_cocos2dx_Label_getOutlineSize(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getOutlineSize'", nullptr);
return 0;
}
int ret = cobj->getOutlineSize();
double ret = cobj->getOutlineSize();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}

65
templates/cocos2dx_files.json
View File

@ -2554,60 +2554,28 @@
"external/curl/include/wp_8.1/curl/stdcheaders.h",
"external/curl/include/wp_8.1/curl/typecheck-gcc.h",
"external/curl/prebuilt/android/Android.mk",
"external/curl/prebuilt/android/arm64-v8a/libcrypto.a",
"external/curl/prebuilt/android/arm64-v8a/libcurl.a",
"external/curl/prebuilt/android/arm64-v8a/libssl.a",
"external/curl/prebuilt/android/armeabi-v7a/libcrypto.a",
"external/curl/prebuilt/android/armeabi-v7a/libcurl.a",
"external/curl/prebuilt/android/armeabi-v7a/libssl.a",
"external/curl/prebuilt/android/armeabi/libcrypto.a",
"external/curl/prebuilt/android/armeabi/libcurl.a",
"external/curl/prebuilt/android/armeabi/libssl.a",
"external/curl/prebuilt/android/x86/libcrypto.a",
"external/curl/prebuilt/android/x86/libcurl.a",
"external/curl/prebuilt/android/x86/libssl.a",
"external/curl/prebuilt/ios/libcrypto.a",
"external/curl/prebuilt/ios/libcurl.a",
"external/curl/prebuilt/ios/libssl.a",
"external/curl/prebuilt/mac/libcrypto.a",
"external/curl/prebuilt/mac/libcurl.a",
"external/curl/prebuilt/mac/libssl.a",
"external/curl/prebuilt/win10/arm/libcurl.dll",
"external/curl/prebuilt/win10/arm/libcurl.lib",
"external/curl/prebuilt/win10/arm/libeay32.dll",
"external/curl/prebuilt/win10/arm/ssleay32.dll",
"external/curl/prebuilt/win10/win32/libcurl.dll",
"external/curl/prebuilt/win10/win32/libcurl.lib",
"external/curl/prebuilt/win10/win32/libeay32.dll",
"external/curl/prebuilt/win10/win32/ssleay32.dll",
"external/curl/prebuilt/win10/x64/libcurl.dll",
"external/curl/prebuilt/win10/x64/libcurl.lib",
"external/curl/prebuilt/win10/x64/libeay32.dll",
"external/curl/prebuilt/win10/x64/ssleay32.dll",
"external/curl/prebuilt/win32/libcurl.dll",
"external/curl/prebuilt/win32/libcurl_imp.lib",
"external/curl/prebuilt/win32/libeay32.lib",
"external/curl/prebuilt/win32/ssleay32.lib",
"external/curl/prebuilt/winrt_8.1/arm/libcurl.dll",
"external/curl/prebuilt/winrt_8.1/arm/libcurl.lib",
"external/curl/prebuilt/winrt_8.1/arm/libeay32.dll",
"external/curl/prebuilt/winrt_8.1/arm/ssleay32.dll",
"external/curl/prebuilt/winrt_8.1/win32/libcurl.dll",
"external/curl/prebuilt/winrt_8.1/win32/libcurl.lib",
"external/curl/prebuilt/winrt_8.1/win32/libeay32.dll",
"external/curl/prebuilt/winrt_8.1/win32/ssleay32.dll",
"external/curl/prebuilt/wp_8.1/arm/libcurl.dll",
"external/curl/prebuilt/wp_8.1/arm/libcurl.lib",
"external/curl/prebuilt/wp_8.1/arm/libeay32.dll",
"external/curl/prebuilt/wp_8.1/arm/libeay32.lib",
"external/curl/prebuilt/wp_8.1/arm/ssleay32.dll",
"external/curl/prebuilt/wp_8.1/arm/ssleay32.lib",
"external/curl/prebuilt/wp_8.1/win32/libcurl.dll",
"external/curl/prebuilt/wp_8.1/win32/libcurl.lib",
"external/curl/prebuilt/wp_8.1/win32/libeay32.dll",
"external/curl/prebuilt/wp_8.1/win32/libeay32.lib",
"external/curl/prebuilt/wp_8.1/win32/ssleay32.dll",
"external/curl/prebuilt/wp_8.1/win32/ssleay32.lib",
"external/edtaa3func/edtaa3func.cpp",
"external/edtaa3func/edtaa3func.h",
"external/flatbuffers/Android.mk",
@ -3173,6 +3141,39 @@
"external/linux-specific/fmod/prebuilt/32-bit/libfmodL.so",
"external/linux-specific/fmod/prebuilt/64-bit/libfmod.so",
"external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so",
"external/openssl/prebuilt/android/Android.mk",
"external/openssl/prebuilt/android/arm64-v8a/libcrypto.a",
"external/openssl/prebuilt/android/arm64-v8a/libssl.a",
"external/openssl/prebuilt/android/armeabi-v7a/libcrypto.a",
"external/openssl/prebuilt/android/armeabi-v7a/libssl.a",
"external/openssl/prebuilt/android/armeabi/libcrypto.a",
"external/openssl/prebuilt/android/armeabi/libssl.a",
"external/openssl/prebuilt/android/x86/libcrypto.a",
"external/openssl/prebuilt/android/x86/libssl.a",
"external/openssl/prebuilt/ios/libcrypto.a",
"external/openssl/prebuilt/ios/libssl.a",
"external/openssl/prebuilt/mac/libcrypto.a",
"external/openssl/prebuilt/mac/libssl.a",
"external/openssl/prebuilt/win10/arm/libeay32.dll",
"external/openssl/prebuilt/win10/arm/ssleay32.dll",
"external/openssl/prebuilt/win10/win32/libeay32.dll",
"external/openssl/prebuilt/win10/win32/ssleay32.dll",
"external/openssl/prebuilt/win10/x64/libeay32.dll",
"external/openssl/prebuilt/win10/x64/ssleay32.dll",
"external/openssl/prebuilt/win32/libeay32.lib",
"external/openssl/prebuilt/win32/ssleay32.lib",
"external/openssl/prebuilt/winrt_8.1/arm/libeay32.dll",
"external/openssl/prebuilt/winrt_8.1/arm/ssleay32.dll",
"external/openssl/prebuilt/winrt_8.1/win32/libeay32.dll",
"external/openssl/prebuilt/winrt_8.1/win32/ssleay32.dll",
"external/openssl/prebuilt/wp_8.1/arm/libeay32.dll",
"external/openssl/prebuilt/wp_8.1/arm/libeay32.lib",
"external/openssl/prebuilt/wp_8.1/arm/ssleay32.dll",
"external/openssl/prebuilt/wp_8.1/arm/ssleay32.lib",
"external/openssl/prebuilt/wp_8.1/win32/libeay32.dll",
"external/openssl/prebuilt/wp_8.1/win32/libeay32.lib",
"external/openssl/prebuilt/wp_8.1/win32/ssleay32.dll",
"external/openssl/prebuilt/wp_8.1/win32/ssleay32.lib",
"external/png/include/android/png.h",
"external/png/include/android/pngconf.h",
"external/png/include/android/pnglibconf.h",