summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-10 15:13:17 +0800
committerruki <[email protected]>2015-06-10 15:13:17 +0800
commit33ad09c9a126cb83ba45fb6f1f2c2898cfbb2dbb (patch)
treed5d9b3c7c39a10426fa5900f5021fabb9e49dfdd /xmake/scripts/base/main.lua
parent112bd89dfd816cac735e447e41de0ff9c5687390 (diff)
save object to configure
Diffstat (limited to 'xmake/scripts/base/main.lua')
-rw-r--r--xmake/scripts/base/main.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index 8fed356c2..0cc3ecd1d 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -129,9 +129,12 @@ function main._prepare_project()
-- xmake config or marked as "reconfig"?
if options._ACTION == "config" or config._RECONFIG then
- -- probe the current platform configure
+ -- probe the current platform
platform.probe(false)
+ -- probe the current project
+ project.probe()
+
-- clear up the configure
config.clearup()
@@ -142,8 +145,8 @@ function main._prepare_project()
if nil == options[k] then options[k] = v end
end
- -- load xmake.lua file
- return project.load(xmake._PROJECT_FILE)
+ -- load the project
+ return project.load()
end
-- done help