cocos2d-x: fixes to update to latest git