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

Merge pull request #2868 from folecr/develop 

fixed #2281: When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes
This commit is contained in:
James Chen 2013-06-12 23:52:53 -07:00
parent 0de1a4ebd8 bab8eff915
commit 1f2f366ef6
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
View File

@ -42,7 +42,6 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineProtocol *pEngine = ScriptingCore::getInstance();
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
#if JSB_ENABLE_DEBUGGER
ScriptingCore::getInstance()->enableDebugger();
ScriptingCore::getInstance()->runScript("main.debug.js");
#else
ScriptingCore::getInstance()->runScript("MoonWarriors-jsb.js");

3
samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
View File

@ -56,9 +56,6 @@ bool AppDelegate::applicationDidFinishLaunching()
#ifdef JS_OBFUSCATED
ScriptingCore::getInstance()->runScript("game.js");
#else
#if JSB_ENABLE_DEBUGGER
ScriptingCore::getInstance()->enableDebugger();
#endif // JSB_ENABLE_DEBUGGER
ScriptingCore::getInstance()->runScript("tests-boot-jsb.js");
#endif
return true;

3
scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -380,6 +380,9 @@ JSBool ScriptingCore::evalString(const char *string, jsval *outVal, const char *
void ScriptingCore::start() {
// for now just this
this->createGlobalContext();
#if JSB_ENABLE_DEBUGGER
this->enableDebugger();
#endif //JSB_ENABLE_DEBUGGER
}
void ScriptingCore::addRegisterCallback(sc_register_sth callback) {