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

Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system

This commit is contained in:
XiaoFeng 2016-03-11 10:38:44 +08:00
parent 9477bfd801
commit 3acea03924
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
View File

@ -1081,10 +1081,18 @@ bool __jsb_cpSpace_addCollisionHandler(JSContext *cx, jsval *vp, jsval *argvp, J
cpCollisionHandler* cp_collision_handler = cpSpaceAddCollisionHandler(space, handler->typeA, handler->typeB); cpCollisionHandler* cp_collision_handler = cpSpaceAddCollisionHandler(space, handler->typeA, handler->typeB);
cp_collision_handler->userData = handler; cp_collision_handler->userData = handler;
#ifdef _USRDLL
cpCollisionHandler * cpHandler = get_cpCollisionHandlerDoNothing();
cp_collision_handler->beginFunc = handler->begin ? &myCollisionBegin : cpHandler->beginFunc;
cp_collision_handler->preSolveFunc = handler->pre ? &myCollisionPre : cpHandler->preSolveFunc;
cp_collision_handler->postSolveFunc = handler->post ? &myCollisionPost : cpHandler->postSolveFunc;
cp_collision_handler->separateFunc = handler->separate ? &myCollisionSeparate : cpHandler->separateFunc;
#else
cp_collision_handler->beginFunc = handler->begin ? &myCollisionBegin : cpCollisionHandlerDoNothing.beginFunc; cp_collision_handler->beginFunc = handler->begin ? &myCollisionBegin : cpCollisionHandlerDoNothing.beginFunc;
cp_collision_handler->preSolveFunc = handler->pre ? &myCollisionPre : cpCollisionHandlerDoNothing.preSolveFunc; cp_collision_handler->preSolveFunc = handler->pre ? &myCollisionPre : cpCollisionHandlerDoNothing.preSolveFunc;
cp_collision_handler->postSolveFunc = handler->post ? &myCollisionPost : cpCollisionHandlerDoNothing.postSolveFunc; cp_collision_handler->postSolveFunc = handler->post ? &myCollisionPost : cpCollisionHandlerDoNothing.postSolveFunc;
cp_collision_handler->separateFunc = handler->separate ? &myCollisionSeparate : cpCollisionHandlerDoNothing.separateFunc; cp_collision_handler->separateFunc = handler->separate ? &myCollisionSeparate : cpCollisionHandlerDoNothing.separateFunc;
#endif
// //
// Already added ? If so, remove it. // Already added ? If so, remove it.

4
external/config.json vendored
View File

@ -1,6 +1,6 @@
{ {
"version":"v3-deps-82", "version":"v3-deps-83",
"zip_file_size":"124827786", "zip_file_size":"127264511",
"repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/", "repo_parent":"https://github.com/cocos2d/",
"move_dirs":{ "move_dirs":{