summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-05-12 08:50:21 +0800
committerruki <[email protected]>2015-05-12 08:50:21 +0800
commita0185c1df5558103ca4c510036088a17bf379c94 (patch)
tree878a6c107ffed11cb93f28d831920825ef472fe7 /xmake/scripts/base/main.lua
parent3b93e699c16862a1c29c2047425ce3d8a4827ea7 (diff)
add _DEFAULTS options
Diffstat (limited to 'xmake/scripts/base/main.lua')
-rw-r--r--xmake/scripts/base/main.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index eb1a57c3d..811f0a650 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -265,12 +265,12 @@ function main._done_option()
assert(options)
-- init the project directory
- options.project = options.project or _PROJECT_DIR
+ options.project = options.project or options._DEFAULTS.project or _PROJECT_DIR
options.project = path.absolute(options.project)
assert(options.project)
-- init the xmake.lua file path
- options.file = options.file or "xmake.lua"
+ options.file = options.file or options._DEFAULTS.file or "xmake.lua"
options.file = path.absolute(options.file, options.project)
assert(options.file)