townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the documentation for LuaJIT 2.1 upgrade.

Browse Source 
For Travis CI - attempt to enable LuaJIT for Android 64-bit (arm64-v8a).
[skip appveyor] [ci only: Android]
This commit is contained in:
Yao Wei Tjong 姚伟忠 2016-01-13 01:35:36 +08:00
parent e61cf6fc40
commit 71a3679d3c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/Urho3D.dox
View File

@ -153,7 +153,7 @@ Urho3D uses the following third-party libraries:
- kNet (https://github.com/juj/kNet)
- libcpuid 0.2.0 (http://libcpuid.sourceforge.net/)
- Lua 5.1 (http://www.lua.org)
- LuaJIT 2.0.3 (http://www.luajit.org)
- LuaJIT 2.1.0 (http://www.luajit.org)
- LZ4 (http://code.google.com/p/lz4/)
- MojoShader (http://icculus.org/mojoshader/)
- Mustache 1.0 (http://mustache.github.io/, https://github.com/kainjow/Mustache)

2
README.md
View File

@ -114,7 +114,7 @@ Urho3D uses the following third-party libraries:
- kNet (https://github.com/juj/kNet)
- libcpuid 0.2.0 (http://libcpuid.sourceforge.net/)
- Lua 5.1 (http://www.lua.org)
- LuaJIT 2.0.3 (http://www.luajit.org)
- LuaJIT 2.1.0 (http://www.luajit.org)
- LZ4 (http://code.google.com/p/lz4/)
- MojoShader (http://icculus.org/mojoshader/)
- Mustache 1.0 (http://mustache.github.io/, https://github.com/kainjow/Mustache)

3
Rakefile
View File

@ -236,9 +236,8 @@ task :ci do
# When not explicitly specified then use generic generator
generator = ENV['XCODE'] ? 'xcode' : (ENV['APPVEYOR'] ? 'vs2015' : '')
# LuaJIT on MinGW build is not possible on Travis-CI with Ubuntu LTS 12.04 as its GCC cross-compiler version is too old, wait until we have Ubuntu LTS 14.04
# The upstream LuaJIT library does not support Android arm64-v8a ABI at the moment but it should be technically possible
# LuaJIT on Web platform is not possible and LuaJIT on iOS platform is not allowed
jit = (ENV['WIN32'] && ENV['TRAVIS']) || (ENV['ANDROID'] && ENV['ANDROID_ABI'] == 'arm64-v8a') || ENV['WEB'] || ENV['IOS'] ? '' : 'JIT=1 URHO3D_LUAJIT_AMALG='
jit = (ENV['WIN32'] && ENV['TRAVIS']) || ENV['WEB'] || ENV['IOS'] ? '' : 'JIT=1 URHO3D_LUAJIT_AMALG='
system "bash -c 'rake cmake #{generator} URHO3D_LUA#{jit}=1 URHO3D_DATABASE_SQLITE=1 URHO3D_EXTRAS=1'" or abort 'Failed to configure Urho3D library build'
if ENV['AVD'] && !ENV['PACKAGE_UPLOAD'] # Skip APK test run when packaging
# Prepare a new AVD in another process to avoid busy waiting