From 62456790b7c23a4f471d45d69f65bf4dbdc5aab2 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 15 May 2015 11:57:59 +0800 Subject: modify xconf format --- xmake/scripts/base/main.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'xmake/scripts/base/main.lua') diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua index 3b9f3d57a..4b404a73e 100644 --- a/xmake/scripts/base/main.lua +++ b/xmake/scripts/base/main.lua @@ -277,11 +277,12 @@ function main._done_option() end assert(options.file) - -- load xmake.xconf file - config.loadxconf() - - -- load xmake.xproj file - local _, errors = project.loadxproj(options.file) + -- load xmake.xconf file first + local errors = config.loadxconf() + if not errors then + -- load xmake.xproj file + errors = project.loadxproj(options.file) + end -- done help if options.help then @@ -313,12 +314,12 @@ function main._done_option() return false end - -- save project - xmake._PROJECT = project - -- dump project project.dump() + -- dump config + config.dump() + -- done action return action.done(options._ACTION or "build") end -- cgit v1.3.1