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

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

This commit is contained in:
zhangbin 2014-03-31 10:47:04 +08:00
parent 95ab15195c 6cc51a2cfc
commit 8aa187d8dc
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/android-build.py
View File

@ -170,18 +170,18 @@ def copy_resources(target, app_android_root):
resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script")
copy_files(resources_dir, assets_dir)
resources_dir = os.path.join(app_android_root, "../../../../external/lua/luasocket")
for root, dirs, files in os.walk(resources_dir):
for f in files:
if os.path.splitext(f)[1] == '.lua':
fall = os.path.join(root,f)
os.system('cp ' + fall+ ' ' + assets_dir)
# lua-tests shared resources with cpp-tests
if target == "lua-tests":
resources_dir = os.path.join(app_android_root, "../../../cpp-tests/Resources")
copy_files(resources_dir, assets_res_dir)
if target == "lua-empty-test":
resources_dir = os.path.join(app_android_root, "../../../../external/lua/luasocket")
for root, dirs, files in os.walk(resources_dir):
for f in files:
if os.path.splitext(f)[1] == '.lua':
fall = os.path.join(root,f)
os.system('cp ' + fall+ ' ' + assets_dir)
def build_samples(target,ndk_build_param,android_platform,build_mode):

2
build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
7aef47d712ae9388fcf70cac6c96bcd596f7fc82
f884da8d42063a506285854e6309a5003507da3a

2
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
View File

@ -105,6 +105,7 @@
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y</Command>
<Message>copy files</Message>
</PreBuildEvent>
@ -153,6 +154,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y</Command>
<Message>copy files</Message>
</PreBuildEvent>

8
tests/lua-tests/src/PerformanceTest/PerformanceTest.lua
View File

@ -1922,6 +1922,14 @@ local function PerformanceMainLayer()
item:registerScriptTapHandler(menuCallback)
item:setPosition(s.width / 2, s.height - i * LINE_SPACE)
menu:addChild(item, kItemTagBasic + i)
if i == MAX_COUNT then
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
if (cc.PLATFORM_OS_IPHONE ~= targetPlatform) and (cc.PLATFORM_OS_IPAD ~= targetPlatform) and
(cc.PLATFORM_OS_ANDROID ~= targetPlatform) and (cc.PLATFORM_OS_WINDOWS ~= targetPlatform) and
(cc.PLATFORM_OS_MAC ~= targetPlatform) then
item:setEnabled(false)
end
end
end
layer:addChild(menu)