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

Merge pull request #13 from andyque/fixProbobufLinuxCompile 

fix lua bindings
This commit is contained in:
pipu 2014-10-14 11:30:35 +08:00
parent e85f5d267b 8a6b78c510
commit 2eb601dc6e
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/config.json vendored
View File

@ -1,5 +1,5 @@
{
"version":"v3-deps-14",
"version":"v3-deps-15",
"zip_file_size":"70810291",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",

5
tools/tolua/cocos2dx_studio.ini
View File

@ -52,8 +52,8 @@ skip = *::[^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType .*
ActionNode::[initWithDictionary],
ActionObject::[initWithDictionary initWithBinary],
BaseData::[copy subtract],
CSLoader::[getInstance],
ActionTimelineCache::[getInstance]
CSLoader::[getInstance nodeFromXML],
ActionTimelineCache::[getInstance loadActionTimelineFromXML]
rename_functions = GUIReader::[shareReader=getInstance purgeGUIReader=destroyInstance],
ActionManagerEx::[shareManager=getInstance purgeActionManager=destroyInstance],
@ -77,4 +77,3 @@ abstract_classes = ArmatureDataManager ComAttribute ComRender ComAudio ActionMan
# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'.
script_control_cpp = no