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

Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3

This commit is contained in:
pandamicro 2015-08-04 11:22:54 +08:00
parent d20052cc22 a89a3c0c56
commit a8a0516bf4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
View File

@ -152,6 +152,9 @@ bool AppDelegate::applicationDidFinishLaunching()
#endif #endif
sc->start(); sc->start();
sc->runScript("script/jsb_boot.js"); sc->runScript("script/jsb_boot.js");
#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif
ScriptEngineProtocol *engine = ScriptingCore::getInstance(); ScriptEngineProtocol *engine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(engine); ScriptEngineManager::getInstance()->setScriptEngine(engine);
ScriptingCore::getInstance()->runScript("main.js"); ScriptingCore::getInstance()->runScript("main.js");

17
templates/js-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
View File

@ -68,13 +68,16 @@ bool AppDelegate::applicationDidFinishLaunching()
jsRuntime->startWithDebugger(); jsRuntime->startWithDebugger();
} }
#else #else
js_module_register(); js_module_register();
ScriptingCore* sc = ScriptingCore::getInstance(); ScriptingCore* sc = ScriptingCore::getInstance();
sc->start(); sc->start();
sc->runScript("script/jsb_boot.js"); sc->runScript("script/jsb_boot.js");
ScriptEngineProtocol *engine = ScriptingCore::getInstance(); #if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
ScriptEngineManager::getInstance()->setScriptEngine(engine); sc->enableDebugger();
ScriptingCore::getInstance()->runScript("main.js"); #endif
ScriptEngineProtocol *engine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(engine);
ScriptingCore::getInstance()->runScript("main.js");
#endif #endif
return true; return true;