summaryrefslogtreecommitdiff
path: root/xmake/core/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-08-14 11:27:19 +0800
committerruki <[email protected]>2017-08-14 11:29:30 +0800
commitdba45d143d8aff047da82cbe1a881056e6e4bc00 (patch)
tree7b80d5de264c17b538a7c9d0fbb234ded39ac683 /xmake/core/main.lua
parent34706ba053dda9dd86902cacf42a6c1878c85234 (diff)
merge repo and require codes
Diffstat (limited to 'xmake/core/main.lua')
-rw-r--r--xmake/core/main.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/core/main.lua b/xmake/core/main.lua
index ef0edd874..227d0e970 100644
--- a/xmake/core/main.lua
+++ b/xmake/core/main.lua
@@ -36,6 +36,7 @@ local privilege = require("base/privilege")
local task = require("base/task")
local project = require("project/project")
local history = require("project/history")
+local package = require("package/package")
-- init the option menu
local menu =
@@ -51,7 +52,6 @@ local menu =
}
-
-- show logo
function main._show_logo()
@@ -62,6 +62,7 @@ function main._show_logo()
\ \/ / | \/ |/ _ | |/ / __ \
> < | \__/ | /_| | < ___/
/_/\_\_|_| |_|\__ \|_|\_\____|
+
by ruki, ${underline}tboox.org${clear}
${point_right} ${bright}Manual${clear}: ${underline}http://xmake.io/#/home${clear}
@@ -162,6 +163,7 @@ function main._init()
-- define task and package apis first before loading project's xmake.lua - calling option.init()
project.define_apis(task.apis())
+ project.define_apis(package.apis())
end
-- the main function