diff options
| author | ruki <[email protected]> | 2015-06-03 09:29:35 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-03 09:29:35 +0800 |
| commit | 08bba742c061c93f28c14499fa17af2f1edc2df8 (patch) | |
| tree | 769eb97f37ada860b6e4c29f6ca247ccf70cbdbc /xmake/scripts/base/config.lua | |
| parent | 03f445c175b2f8e4768bbff28065f935b9fe3201 (diff) | |
add private configure for preprocessor
Diffstat (limited to 'xmake/scripts/base/config.lua')
| -rw-r--r-- | xmake/scripts/base/config.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/scripts/base/config.lua b/xmake/scripts/base/config.lua index 877f7d026..f53338a05 100644 --- a/xmake/scripts/base/config.lua +++ b/xmake/scripts/base/config.lua @@ -153,7 +153,7 @@ function config._make() -- get configs from all targets for k, v in pairs(configs) do - if type(k) == "string" and not k:startswith("_") then + if type(k) == "string" and not k:find("_%u+") then current[k] = v end end @@ -242,7 +242,7 @@ function config.savexconf() assert(configs) -- open the configure file - local path = options.project .. "/xmake.xconf" + local path = options.project .. "/.xmake.xconf" local file = io.open(path, "w") if not file then -- error @@ -288,7 +288,7 @@ function config.loadxconf() end -- load and execute the xmake.xconf - local path = options.project .. "/xmake.xconf" + local path = options.project .. "/.xmake.xconf" local newenv = preprocessor.loadfile(path, "config", configures, {"target"}) -- exists local configures? @@ -370,7 +370,7 @@ function config.dump() assert(config._CURRENT) -- dump - utils.dump(config._CURRENT) + utils.dump(config._CURRENT, "__%w*") end |