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

Merge pull request #4 from chuanweizhang2013/v3luaruntime 

V3luaruntime
This commit is contained in:
cocoscodeide 2014-05-13 16:03:12 +08:00
parent 64b630912d f35d69805f
commit a300194d8f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
View File

@ -26,15 +26,14 @@ bool AppDelegate::applicationDidFinishLaunching()
initRuntime(); initRuntime();
#endif #endif
// initialize director
auto director = Director::getInstance();
auto glview = director->getOpenGLView();
if(!glview) {
if (!ConfigParser::getInstance()->isInit()) { if (!ConfigParser::getInstance()->isInit()) {
ConfigParser::getInstance()->readConfig(); ConfigParser::getInstance()->readConfig();
} }
// initialize director
auto director = Director::getInstance();
auto glview = director->getOpenGLView();
if(!glview) {
Size viewSize = ConfigParser::getInstance()->getInitViewSize(); Size viewSize = ConfigParser::getInstance()->getInitViewSize();
string title = ConfigParser::getInstance()->getInitViewName(); string title = ConfigParser::getInstance()->getInitViewName();
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)

7
templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json
View File

@ -26,6 +26,13 @@
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script",
"to": "" "to": ""
}, },
{
"from": "../../../res",
"to": "res",
"include": [
"config.json"
]
},
{ {
"from": "../../cocos2d-x/external/lua/luasocket", "from": "../../cocos2d-x/external/lua/luasocket",
"to": "", "to": "",