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

Merge pull request #7235 from samuele3hu/v3_bu_fix 

Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
This commit is contained in:
minggo 2014-06-27 18:07:49 +08:00
parent a85f522dd1 67423e0dd2
commit 7f3749dba5
2 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp
View File

@ -6312,6 +6312,67 @@ static void extendEventListenerFocus(lua_State* tolua_S)
}
int lua_cocos2dx_Application_isIOS64bit(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Application* cobj = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Application",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Application*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Application_isIOS64bit'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
bool isIOS64bit = false;
Application::Platform platform = cocos2d::Application::getInstance()->getTargetPlatform();
if (Application::Platform::OS_IPHONE == platform || Application::Platform::OS_IPAD == platform)
{
#if defined(__LP64__)
isIOS64bit = true;
#endif
}
tolua_pushboolean(tolua_S, isIOS64bit);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIOS64bit",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Application_isIOS64bit'.",&tolua_err);
#endif
return 0;
}
static void extendApplication(lua_State* tolua_S)
{
lua_pushstring(tolua_S, "cc.Application");
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
tolua_function(tolua_S, "isIOS64bit", lua_cocos2dx_Application_isIOS64bit);
}
lua_pop(tolua_S, 1);
}
int register_all_cocos2dx_manual(lua_State* tolua_S)
{
if (NULL == tolua_S)
@ -6364,6 +6425,7 @@ int register_all_cocos2dx_manual(lua_State* tolua_S)
extendOrbitCamera(tolua_S);
extendTMXLayer(tolua_S);
extendEventListenerFocus(tolua_S);
extendApplication(tolua_S);
return 0;
}

7
tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua
View File

@ -1,5 +1,9 @@
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
local isIOS64bit = cc.Application:getInstance():isIOS64bit()
if cc.PLATFORM_OS_LINUX ~= targetPlatform and isIOS64bit ~= true then
require("src/ByteCodeEncryptTest/ByteCodeTest")
require("src/ByteCodeEncryptTest/ByteCodeAndEncryptTest")
end
local LINE_SPACE = 40
local ItemTagBasic = 1000
@ -51,6 +55,9 @@ local function byteCodeEncryptMainLayer()
item:registerScriptTapHandler(menuCallback)
item:setPosition(size.width / 2, size.height - i * LINE_SPACE)
menu:addChild(item, ItemTagBasic + i)
if cc.PLATFORM_OS_LINUX == targetPlatform or isIOS64bit == true then
item:setEnabled(false)
end
end
layer:addChild(menu)