diff options
| author | ruki <[email protected]> | 2015-05-16 12:09:34 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-05-16 12:09:34 +0800 |
| commit | 05c2b5a567c1e2174ae136e18ca254d98a6b257c (patch) | |
| tree | ca197db72dffb009ed457b65c046ef5ff7927360 /xmake/scripts/base/config.lua | |
| parent | 9eb348a32a7472d533b9084d3b53491078987149 (diff) | |
reimpl project configure
Diffstat (limited to 'xmake/scripts/base/config.lua')
| -rw-r--r-- | xmake/scripts/base/config.lua | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xmake/scripts/base/config.lua b/xmake/scripts/base/config.lua index 26272fcf9..cb169550e 100644 --- a/xmake/scripts/base/config.lua +++ b/xmake/scripts/base/config.lua @@ -24,9 +24,10 @@ local config = config or {} -- load modules -local io = require("base/io") -local utils = require("base/utils") -local option = require("base/option") +local io = require("base/io") +local utils = require("base/utils") +local option = require("base/option") +local preprocessor = require("base/preprocessor") -- auto configs function config._auto(name) @@ -220,7 +221,7 @@ function config.loadxconf() end end - -- load and execute the xmake.xproj + -- load and execute the xmake.xconf local path = options.project .. "/xmake.xconf" local configs, errors = preprocessor.loadfile(path, "config", configures, {"target"}) @@ -293,9 +294,6 @@ function config.loadxconf() end end end - - -- ok - return nil end -- dump configs |
