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

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19052)

This commit is contained in:
CocosRobot 2018-09-17 12:33:20 +08:00 committed by leda
parent e0210bd870
commit 16126f2571
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19213,7 +19213,7 @@ bool js_cocos2dx_FileUtils_getDefaultResourceRootPath(JSContext *cx, uint32_t ar
cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL); cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getDefaultResourceRootPath : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getDefaultResourceRootPath : Invalid Native Object");
if (argc == 0) { if (argc == 0) {
const std::string& ret = cobj->getDefaultResourceRootPath(); const std::string ret = cobj->getDefaultResourceRootPath();
JS::RootedValue jsret(cx); JS::RootedValue jsret(cx);
jsret = std_string_to_jsval(cx, ret); jsret = std_string_to_jsval(cx, ret);
args.rval().set(jsret); args.rval().set(jsret);
@ -19291,7 +19291,7 @@ bool js_cocos2dx_FileUtils_getSearchPaths(JSContext *cx, uint32_t argc, jsval *v
cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL); cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getSearchPaths : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getSearchPaths : Invalid Native Object");
if (argc == 0) { if (argc == 0) {
const std::vector<std::string>& ret = cobj->getSearchPaths(); std::vector<std::string> ret = cobj->getSearchPaths();
JS::RootedValue jsret(cx); JS::RootedValue jsret(cx);
jsret = std_vector_string_to_jsval(cx, ret); jsret = std_vector_string_to_jsval(cx, ret);
args.rval().set(jsret); args.rval().set(jsret);
@ -19333,7 +19333,7 @@ bool js_cocos2dx_FileUtils_getOriginalSearchPaths(JSContext *cx, uint32_t argc,
cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL); cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getOriginalSearchPaths : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getOriginalSearchPaths : Invalid Native Object");
if (argc == 0) { if (argc == 0) {
const std::vector<std::string>& ret = cobj->getOriginalSearchPaths(); std::vector<std::string> ret = cobj->getOriginalSearchPaths();
JS::RootedValue jsret(cx); JS::RootedValue jsret(cx);
jsret = std_vector_string_to_jsval(cx, ret); jsret = std_vector_string_to_jsval(cx, ret);
args.rval().set(jsret); args.rval().set(jsret);
@ -20144,7 +20144,7 @@ bool js_cocos2dx_FileUtils_getSearchResolutionsOrder(JSContext *cx, uint32_t arg
cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL); cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getSearchResolutionsOrder : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getSearchResolutionsOrder : Invalid Native Object");
if (argc == 0) { if (argc == 0) {
const std::vector<std::string>& ret = cobj->getSearchResolutionsOrder(); std::vector<std::string> ret = cobj->getSearchResolutionsOrder();
JS::RootedValue jsret(cx); JS::RootedValue jsret(cx);
jsret = std_vector_string_to_jsval(cx, ret); jsret = std_vector_string_to_jsval(cx, ret);
args.rval().set(jsret); args.rval().set(jsret);

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

@ -33300,7 +33300,7 @@ int lua_cocos2dx_FileUtils_getDefaultResourceRootPath(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getDefaultResourceRootPath'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getDefaultResourceRootPath'", nullptr);
return 0; return 0;
} }
const std::string& ret = cobj->getDefaultResourceRootPath(); const std::string ret = cobj->getDefaultResourceRootPath();
lua_pushlstring(tolua_S,ret.c_str(),ret.length()); lua_pushlstring(tolua_S,ret.c_str(),ret.length());
return 1; return 1;
} }
@ -33494,7 +33494,7 @@ int lua_cocos2dx_FileUtils_getSearchPaths(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getSearchPaths'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getSearchPaths'", nullptr);
return 0; return 0;
} }
const std::vector<std::string>& ret = cobj->getSearchPaths(); std::vector<std::string> ret = cobj->getSearchPaths();
ccvector_std_string_to_luaval(tolua_S, ret); ccvector_std_string_to_luaval(tolua_S, ret);
return 1; return 1;
} }
@ -33594,7 +33594,7 @@ int lua_cocos2dx_FileUtils_getOriginalSearchPaths(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getOriginalSearchPaths'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getOriginalSearchPaths'", nullptr);
return 0; return 0;
} }
const std::vector<std::string>& ret = cobj->getOriginalSearchPaths(); std::vector<std::string> ret = cobj->getOriginalSearchPaths();
ccvector_std_string_to_luaval(tolua_S, ret); ccvector_std_string_to_luaval(tolua_S, ret);
return 1; return 1;
} }
@ -34893,7 +34893,7 @@ int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getSearchResolutionsOrder'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getSearchResolutionsOrder'", nullptr);
return 0; return 0;
} }
const std::vector<std::string>& ret = cobj->getSearchResolutionsOrder(); std::vector<std::string> ret = cobj->getSearchResolutionsOrder();
ccvector_std_string_to_luaval(tolua_S, ret); ccvector_std_string_to_luaval(tolua_S, ret);
return 1; return 1;
} }

1
templates/cocos2dx_files.json
View File

@ -3671,7 +3671,6 @@
"external/recast/proj.win10/librecast.vcxproj.filters", "external/recast/proj.win10/librecast.vcxproj.filters",
"external/recast/proj.win32/librecast.vcxproj", "external/recast/proj.win32/librecast.vcxproj",
"external/recast/proj.win32/librecast.vcxproj.filters", "external/recast/proj.win32/librecast.vcxproj.filters",
"external/sqlite3/Android.mk",
"external/sqlite3/include/sqlite3.h", "external/sqlite3/include/sqlite3.h",
"external/sqlite3/include/sqlite3ext.h", "external/sqlite3/include/sqlite3ext.h",
"external/sqlite3/libraries/win10/arm/sqlite3.dll", "external/sqlite3/libraries/win10/arm/sqlite3.dll",