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

Merge pull request #12707 from pandamicro/v3.7-release 

[ci skip][Simulator JSB] Fix issue caused by video and web view binding
This commit is contained in:
pandamicro 2015-07-07 09:48:42 +08:00
parent d52006692c a9f98aefea
commit e73906a119
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/simulator/frameworks/runtime-src/Classes/js_module_register.h
View File

@ -27,12 +27,12 @@
#include "jsb_cocos2dx_navmesh_auto.hpp" #include "jsb_cocos2dx_navmesh_auto.hpp"
#include "navmesh/jsb_cocos2dx_navmesh_manual.h" #include "navmesh/jsb_cocos2dx_navmesh_manual.h"
// #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
// #include "experimental/jsb_cocos2dx_experimental_video_auto.hpp" #include "jsb_cocos2dx_experimental_video_auto.hpp"
// #include "experimental/jsb_cocos2dx_experimental_video_manual.h" #include "experimental/jsb_cocos2dx_experimental_video_manual.h"
// #include "experimental/jsb_cocos2dx_experimental_webView_auto.hpp" #include "jsb_cocos2dx_experimental_webView_auto.hpp"
// #include "experimental/jsb_cocos2dx_experimental_webView_manual.h" #include "experimental/jsb_cocos2dx_experimental_webView_manual.h"
// #endif #endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "platform/android/CCJavascriptJavaBridge.h" #include "platform/android/CCJavascriptJavaBridge.h"
@ -98,12 +98,12 @@ int js_module_register()
sc->addRegisterCallback(register_all_cocos2dx_navmesh_manual); sc->addRegisterCallback(register_all_cocos2dx_navmesh_manual);
#endif #endif
// #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
// sc->addRegisterCallback(register_all_cocos2dx_experimental_video); sc->addRegisterCallback(register_all_cocos2dx_experimental_video);
// sc->addRegisterCallback(register_all_cocos2dx_experimental_video_manual); sc->addRegisterCallback(register_all_cocos2dx_experimental_video_manual);
// sc->addRegisterCallback(register_all_cocos2dx_experimental_webView); sc->addRegisterCallback(register_all_cocos2dx_experimental_webView);
// sc->addRegisterCallback(register_all_cocos2dx_experimental_webView_manual); sc->addRegisterCallback(register_all_cocos2dx_experimental_webView_manual);
// #endif #endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
sc->addRegisterCallback(JavascriptJavaBridge::_js_register); sc->addRegisterCallback(JavascriptJavaBridge::_js_register);