diff options
| author | ruki <[email protected]> | 2015-06-04 15:46:43 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-04 15:46:43 +0800 |
| commit | 6c5fbedfe26db54b0bbb95fa9154ed759c7ad98f (patch) | |
| tree | c7a1d2ba8ee4076e7576df79a53c1dfaadf7f14b /xmake/scripts/platform/android | |
| parent | 83295bd3a1b27f844759aeadbbdc23f51e2f2d89 (diff) | |
rebuild compiler and linker
Diffstat (limited to 'xmake/scripts/platform/android')
| -rw-r--r-- | xmake/scripts/platform/android/android.lua | 36 | ||||
| -rw-r--r-- | xmake/scripts/platform/android/prober.lua | 16 |
2 files changed, 26 insertions, 26 deletions
diff --git a/xmake/scripts/platform/android/android.lua b/xmake/scripts/platform/android/android.lua index ba180d87d..b8e91a09f 100644 --- a/xmake/scripts/platform/android/android.lua +++ b/xmake/scripts/platform/android/android.lua @@ -17,44 +17,44 @@ -- Copyright (C) 2009 - 2015, ruki All rights reserved. -- -- @author ruki --- @file _android.lua +-- @file android.lua -- --- define module: _android -local _android = _android or {} +-- define module: android +local android = android or {} -- load modules local config = require("base/config") -- init host -_android._HOST = xmake._HOST +android._HOST = xmake._HOST -- init architectures -_android._ARCHS = {"armv5te", "armv6", "armv7-a"} +android._ARCHS = {"armv5te", "armv6", "armv7-a"} -- make configure -function _android.make(configs) +function android.make(configs) - -- init the file name format - configs.format = {} - configs.format.static = {"lib", ".a"} - configs.format.object = {"", ".o"} - configs.format.shared = {"lib", ".so"} + -- init the file formats + configs.formats = {} + configs.formats.static = {"lib", ".a"} + configs.formats.object = {"", ".o"} + configs.formats.shared = {"lib", ".so"} end -- get the option menu for action: xmake config or global -function _android.menu(action) +function android.menu(action) -- init config option menu - _android._MENU_CONFIG = _android._MENU_CONFIG or + android._MENU_CONFIG = android._MENU_CONFIG or { {} , {nil, "ndk", "kv", nil, "The NDK Directory" } , {nil, "ndk_sdkver", "kv", "auto", "The SDK Version for NDK" } , } -- init global option menu - _android._MENU_GLOBAL = _android._MENU_GLOBAL or + android._MENU_GLOBAL = android._MENU_GLOBAL or { {} , {nil, "ndk", "kv", nil, "The NDK Directory" } , {nil, "ndk_sdkver", "kv", "auto", "The SDK Version for NDK" } @@ -62,11 +62,11 @@ function _android.menu(action) -- get the option menu if action == "config" then - return _android._MENU_CONFIG + return android._MENU_CONFIG elseif action == "global" then - return _android._MENU_GLOBAL + return android._MENU_GLOBAL end end --- return module: _android -return _android +-- return module: android +return android diff --git a/xmake/scripts/platform/android/prober.lua b/xmake/scripts/platform/android/prober.lua index 28ccc3e9f..67078f244 100644 --- a/xmake/scripts/platform/android/prober.lua +++ b/xmake/scripts/platform/android/prober.lua @@ -17,7 +17,7 @@ -- Copyright (C) 2009 - 2015, ruki All rights reserved. -- -- @author ruki --- @file _prober.lua +-- @file prober.lua -- -- load modules @@ -26,11 +26,11 @@ local path = require("base/path") local utils = require("base/utils") local string = require("base/string") --- define module: _prober -local _prober = _prober or {} +-- define module: prober +local prober = prober or {} -- probe the architecture -function _prober._probe_arch(configs) +function prober._probe_arch(configs) -- get the architecture local arch = configs.arch @@ -46,12 +46,12 @@ function _prober._probe_arch(configs) end -- probe the configure -function _prober.done(configs, is_global) +function prober.done(configs, is_global) -- probe the architecture - if not _prober._probe_arch(configs) then return end + if not prober._probe_arch(configs) then return end end --- return module: _prober -return _prober +-- return module: prober +return prober |
