Skip to content

[external] update to v152 #19247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2018
Merged

[external] update to v152 #19247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a8c347
[external] update to v152
Dec 14, 2018
ee28aee
luaL_reg -> luaL_Reg
Dec 14, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos/scripting/lua-bindings/manual/CCLuaStack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bool LuaStack::init(void)
toluafix_open(_state);

// Register our version of the global "print" function
const luaL_reg global_functions [] = {
const luaL_Reg global_functions [] = {
{"print", lua_print},
{"release_print",lua_release_print},
{nullptr, nullptr}
Expand Down
4 changes: 2 additions & 2 deletions cocos/scripting/lua-bindings/manual/network/lua_downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ static int lua_downloader_tostring(lua_State *L)
return 1;
}

static const struct luaL_reg downloaderStaticFns[] = {
static const struct luaL_Reg downloaderStaticFns[] = {
{ "new", lua_downloader_new },
/*
* cocos2d::Downloader is not a subclass of cocos2d::Ref,
Expand All @@ -322,7 +322,7 @@ static const struct luaL_reg downloaderStaticFns[] = {
};


static const struct luaL_reg downloaderMemberFns[] = {
static const struct luaL_Reg downloaderMemberFns[] = {
{ "createDownloadDataTask", lua_downloader_createDownloadDataTask },
{ "createDownloadFileTask", lua_downloader_createDownloadFileTask },
{ "setOnFileTaskSuccess", lua_downloader_setOnFileTaskSuccess },
Expand Down
4 changes: 2 additions & 2 deletions external/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "v3-deps-151",
"zip_file_size": "146180003",
"version": "v3-deps-152",
"zip_file_size": "144236187",
"repo_name": "cocos2d-x-3rd-party-libs-bin",
"repo_parent": "https://github.com/cocos2d/",
"move_dirs": {
Expand Down