diff options
| author | ruki <[email protected]> | 2015-05-19 13:55:47 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-05-19 13:55:47 +0800 |
| commit | f9214c5e20b64d662af20b83da5889e6675dea95 (patch) | |
| tree | 7683e43755a87f624f2c972dec511d83e5191b26 /xmake/scripts/base | |
| parent | 050d1882cf578ca81f92666d42bc005b7c0eb914 (diff) | |
add platform for macosx
Diffstat (limited to 'xmake/scripts/base')
| -rw-r--r-- | xmake/scripts/base/main.lua | 11 | ||||
| -rw-r--r-- | xmake/scripts/base/makefile.lua | 7 | ||||
| -rw-r--r-- | xmake/scripts/base/os.lua | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua index e746e5f01..e09613254 100644 --- a/xmake/scripts/base/main.lua +++ b/xmake/scripts/base/main.lua @@ -32,6 +32,7 @@ local config = require("base/config") local project = require("base/project") local preprocessor = require("base/preprocessor") local action = require("action/action") +local platform = require("platform/platform") -- init the option menu local menu = @@ -325,12 +326,22 @@ function main._done_option() return false end + -- init platform + if not platform.init() then + -- error + utils.error("init platform: %s failed!", config.target().plat) + return false + end + -- dump project project.dump() -- dump config config.dump() + -- dump platform + platform.dump() + -- enter the project directory if not os.cd(xmake._PROJECT_DIR) then -- error diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua index b7d8813ee..80ef7aa45 100644 --- a/xmake/scripts/base/makefile.lua +++ b/xmake/scripts/base/makefile.lua @@ -29,6 +29,7 @@ local os = require("base/os") local utils = require("base/utils") local config = require("base/config") local project = require("base/project") +local platform = require("platform/platform") -- make the given target to the makefile function makefile._make_target(file, name, target) @@ -47,6 +48,12 @@ function makefile._make_target(file, name, target) end end + -- make dependence for object + local srcfiles = os.match(target.files) + for _, srcfile in ipairs(srcfiles) do + file:write(" " .. srcfile) + end + -- make dependence end file:write("\n") diff --git a/xmake/scripts/base/os.lua b/xmake/scripts/base/os.lua index 31434f37c..31ff7957f 100644 --- a/xmake/scripts/base/os.lua +++ b/xmake/scripts/base/os.lua @@ -155,6 +155,7 @@ end -- @code -- local dirs, count = os.match("./src/*", true) -- local files, count = os.match("./src/**.c") +-- local file = os.match("./src/test.c") -- @endcode -- function os.match(pattern, findir) |
