Skip to content
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

Update config files for bindings-generator #63

Merged
merged 10 commits into from
Mar 7, 2014
Merged

Update config files for bindings-generator #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5319d8
Update the submodule about `cocos2d-x`
samuele3hu2022 Mar 6, 2014
f0c4b9b
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
samuele3hu2022 Mar 6, 2014
f4a710e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
samuele3hu2022 Mar 6, 2014
06ac650
close #4284:Update the ‘cocos2d-x’ submodule
samuele3hu2022 Mar 7, 2014
45b5281
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
samuele3hu2022 Mar 7, 2014
f19954e
Update the `cocos2d-x` submodule
samuele3hu2022 Mar 7, 2014
66788f4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
samuele3hu2022 Mar 7, 2014
15f3d13
Update config files for bindings-generator
samuele3hu2022 Mar 7, 2014
1f750c3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
samuele3hu2022 Mar 7, 2014
94a8e84
Update config files for bindings-generator
samuele3hu2022 Mar 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions tools/tojs/cocos2dx.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ skip = Node::[^setPosition$ setGLServerState description getUserObject .*UserDat
CatmullRom.*::[create actionWithDuration],
Bezier.*::[create actionWithDuration],
CardinalSpline.*::[create actionWithDuration setPoints],
Scheduler::[pause resume unschedule schedule update isTargetPaused],
Scheduler::[pause resume unschedule schedule update isTargetPaused isScheduled],
TextureCache::[addPVRTCImage addImageAsync],
*::[copyWith.* onEnter.* onExit.* ^description$ getObjectType onTouch.* onAcc.* onKey.* onRegisterTouchListener],
FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getFileData getDataFromFile getWritablePath setPopupNotify destroyInstance getFullPathCache],
Expand All @@ -115,7 +115,10 @@ skip = Node::[^setPosition$ setGLServerState description getUserObject .*UserDat
EventListenerVector::[*],
EventListener(Touch|Keyboard).*::[create],
EventTouch::[(s|g)etTouches],
Device::[getTextureDataForText]
Device::[getTextureDataForText],
EventDispatcher::[dispatchCustomEvent],
EventCustom::[getUserData setUserData],
Component::[serialize]

rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame],
MenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize getFontSizeObj=getFontSize getFontNameObj=getFontName],
Expand Down
2 changes: 1 addition & 1 deletion tools/tojs/cocos2dx_gui.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android_flags = -D_SIZE_T_DEFINED_
clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include
clang_flags = -nostdinc -x c++ -std=c++11

cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s

cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT

Expand Down
2 changes: 1 addition & 1 deletion tools/tojs/cocos2dx_studio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ classes = Armature ArmatureAnimation Skin Bone ColliderDetector ColliderBody Arm

skip = *::[createInstance ^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType .*HSV onTouch.* onAcc.* onKey.* onRegisterTouchListener (s|g)etBlendFunc (s|g)etUserObject ccTouch.*],
InputDelegate::[didAccelerate on.*],
GUIReader::[storeFileDesignSize getFileDesignSize purgeGUIReader],
GUIReader::[storeFileDesignSize getFileDesignSize purgeGUIReader getParseCallBackMap getParseObjectMap],
ComAttribute::[getDict],
BatchNode::[init draw],
Armature::[createBone updateBlendType getBody setBody getShapeList .*BlendFunc],
Expand Down