diff options
| author | ruki <[email protected]> | 2020-05-18 22:39:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-05-18 09:57:41 +0800 |
| commit | 937bd96c26edc111a3226a4feb2a6748041ab461 (patch) | |
| tree | 0db02fdc1321ac02cee907ed0aa9efc0a9e4ebc8 /xmake/platforms/linux | |
| parent | c0afaacde90abf081bab19279c3ea6d4dbeae86d (diff) | |
check toolchains for macosx
Diffstat (limited to 'xmake/platforms/linux')
| -rw-r--r-- | xmake/platforms/linux/check.lua (renamed from xmake/platforms/linux/config.lua) | 2 | ||||
| -rw-r--r-- | xmake/platforms/linux/global.lua | 32 | ||||
| -rw-r--r-- | xmake/platforms/linux/xmake.lua | 7 |
3 files changed, 3 insertions, 38 deletions
diff --git a/xmake/platforms/linux/config.lua b/xmake/platforms/linux/check.lua index ac9b42931..1671ee0e9 100644 --- a/xmake/platforms/linux/config.lua +++ b/xmake/platforms/linux/check.lua @@ -15,7 +15,7 @@ -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki --- @file config.lua +-- @file check.lua -- -- imports diff --git a/xmake/platforms/linux/global.lua b/xmake/platforms/linux/global.lua deleted file mode 100644 index d74d84943..000000000 --- a/xmake/platforms/linux/global.lua +++ /dev/null @@ -1,32 +0,0 @@ ---!A cross-platform build utility based on Lua --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- --- Copyright (C) 2015-2020, TBOOX Open Source Group. --- --- @author ruki --- @file global.lua --- - --- imports -import("core.base.global") - --- check it -function main(platform, name) - - -- we cannot check the global configuration with the given name - if name then - raise("we cannot check global." .. name) - end -end - diff --git a/xmake/platforms/linux/xmake.lua b/xmake/platforms/linux/xmake.lua index 53517239a..21e4d2e51 100644 --- a/xmake/platforms/linux/xmake.lua +++ b/xmake/platforms/linux/xmake.lua @@ -36,11 +36,8 @@ platform("linux") -- set install directory set_installdir("/usr/local") - -- on check project configuration - on_config_check("config") - - -- on check global configuration - on_global_check("global") + -- on check + on_check("check") -- on load on_load("load") |
