From 33ad09c9a126cb83ba45fb6f1f2c2898cfbb2dbb Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 10 Jun 2015 15:13:17 +0800 Subject: save object to configure --- xmake/scripts/base/main.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xmake/scripts/base/main.lua') 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 -- cgit v1.3.1